Fix panic involving nil values

hyperledger-labs · Nov 12, 2020 · a1222b9 · a1222b9
1 parent d46cc09
commit a1222b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/assets/asset.go b/assets/asset.go
@@ -44,7 +44,9 @@ func NewAsset(m map[string]interface{}) (a Asset, err errors.ICCError) {
 
 	a = Asset{}
 	for k, v := range m {
-		a[k] = v
+		if v != nil {
+			a[k] = v
+		}
 	}
 
 	// Generate object key

diff --git a/assets/references.go b/assets/references.go
@@ -19,7 +19,7 @@ func (a Asset) Refs(stub shim.ChaincodeStubInterface) ([]Key, errors.ICCError) {
 	var keys []Key
 	for _, subAsset := range assetSubAssets {
 		subAssetRefInterface, subAssetIncluded := a[subAsset.Tag]
-		if !subAssetIncluded {
+		if !subAssetIncluded || subAssetRefInterface == nil {
 			// If subAsset is not included, no need to append
 			continue
 		}
@@ -46,6 +46,11 @@ func (a Asset) Refs(stub shim.ChaincodeStubInterface) ([]Key, errors.ICCError) {
 		}
 
 		for _, subAssetRefInterface := range subAssetAsArray {
+			// This is here as a safety measure
+			if subAssetRefInterface == nil {
+				continue
+			}
+
 			subAssetRefMap, ok := subAssetRefInterface.(map[string]interface{})
 			if !ok {
 				// If subAsset is badly formatted, this method shouldn't have been called