GitList

Browse code

Add missing bounds in ContinueOnError

ContinueOnError assumes that something of type errcode.Errors contains
at least one error. This is generally true, but might not be true if the
remote registry returns an empty error body or invalid JSON. Add the
bounds check, and in the case where it fails, allow fallbacks to v1.

Fixes #18481

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

Aaron Lehmann authored on 2015/12/08 10:28:10
Showing 1 changed files

registry/registry.go index 6a0587a..fc2959a 100644

registry/registry.go

History View file @ 1ebfa29

@@ -213,6 +213,9 @@ func (e ErrNoSupport) Error() string {
                      func ContinueOnError(err error) bool {
                      	switch v := err.(type) {
                      	case errcode.Errors:
                     +		if len(v) == 0 {
                     +			return true
                     +		}
                      		return ContinueOnError(v[0])
                      	case ErrNoSupport:
                      		return ContinueOnError(v.Err)