Merge pull request #52 from dmcgowan/fix-panic-notfound

Fix panic when type is not found
containerd · Nov 5, 2024 · 1666bdb · 1666bdb
2 parents 30fd8da 21b066a
commit 1666bdb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/types.go b/types.go
@@ -284,16  284,14 @@ func getTypeByUrl(url string) (reflect.Type, error) {
 	mu.RUnlock()
 	mt, err := protoregistry.GlobalTypes.FindMessageByURL(url)
 	if err != nil {
-		e := protoregistry.NotFound
-		if !errors.Is(err, e) {
-			return nil, fmt.Errorf("type with url %s: %w", url, ErrNotFound)
-		}
-
-		for _, h := range handlers {
-			if t := h.GetType(url); t != nil {
-				return t, nil
 		if errors.Is(err, protoregistry.NotFound) {
 			for _, h := range handlers {
 				if t := h.GetType(url); t != nil {
 					return t, nil
 				}
 			}
 		}
 		return nil, fmt.Errorf("type with url %s: %w", url, ErrNotFound)
 	}
 	empty := mt.New().Interface()
 	return reflect.TypeOf(empty).Elem(), nil

diff --git a/types_test.go b/types_test.go
@@ -18,6  18,7 @@ package typeurl
 
 import (
 	"bytes"
 	"errors"
 	"reflect"
 	"testing"
 	"time"
@@ -230,3  231,13 @@ func TestProtoFallback(t *testing.T) {
 		t.Fatalf("expected % v but got % v", expected, ts.AsTime())
 	}
 }
 
 func TestUnmarshalNotFound(t *testing.T) {
 	_, err := UnmarshalByTypeURL("doesntexist", []byte("{}"))
 	if err == nil {
 		t.Fatalf("expected error unmarshalling type which does not exist")
 	}
 	if !errors.Is(err, ErrNotFound) {
 		t.Fatalf("unexpected error unmarshalling type which does not exist: %v", err)
 	}
 }