Add another panic safeguard

hyperledger-labs · Nov 13, 2020 · 3e6e604 · 3e6e604
1 parent 04dcad1
commit 3e6e604
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/assets/references.go b/assets/references.go
@@ -57,6 +57,10 @@ func (a Asset) Refs(stub shim.ChaincodeStubInterface) ([]Key, errors.ICCError) {
 				return nil, errors.NewCCError("sub-asset reference badly formatted", 400)
 			}
 
+			if subAssetRefMap == nil {
+				return nil, errors.NewCCError(fmt.Sprintf("sub-asset reference '%s' cannot be nil", subAsset.Tag), 400)
+			}
+
 			subAssetTypeName, ok := subAssetRefMap["@assetType"]
 			if ok && subAssetTypeName != subAssetDataType {
 				return nil, errors.NewCCError("sub-asset reference of wrong asset type", 400)

diff --git a/assets/update.go b/assets/update.go
@@ -38,7 +38,7 @@ func (a *Asset) Update(stub shim.ChaincodeStubInterface, update map[string]inter
 
 		// Check if property is included in the update map
 		propInterface, propIncluded := update[prop.Tag]
-		if !propIncluded {
+		if !propIncluded || propInterface == nil {
 			continue
 		}