From cd012efa2e46ec82b7a1f742bfc6858513c4ee37 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 27 May 2016 11:13:12 +0200 Subject: [PATCH] Validate filter values before calling registry. Signed-off-by: Vincent Demeester --- daemon/search.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/search.go b/daemon/search.go index a62f70ee13..4f749608f8 100644 --- a/daemon/search.go +++ b/daemon/search.go @@ -32,11 +32,6 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s return nil, err } - unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers) - if err != nil { - return nil, err - } - var isAutomated, isOfficial bool var hasStarFilter = 0 if searchFilters.Include("is-automated") { @@ -66,6 +61,11 @@ func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs s } } + unfilteredResult, err := daemon.RegistryService.Search(ctx, term, authConfig, dockerversion.DockerUserAgent(ctx), headers) + if err != nil { + return nil, err + } + filteredResults := []registrytypes.SearchResult{} for _, result := range unfilteredResult.Results { if searchFilters.Include("is-automated") {