Fix another iterator pointer issue (#184)

deso-protocol · Jan 17, 2022 · 126a738 · 126a738
1 parent 6b2d32d
commit 126a738
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/block_view_nft.go b/lib/block_view_nft.go
@@ -1179,7 +1179,8 @@ func (bav *UtxoView) _helpConnectNFTSold(args HelpConnectNFTSoldStruct) (
 		_additionalRoyaltiesNanos uint64, _additionalRoyalties []*PublicKeyRoyaltyPair, _err error) {
 		additionalRoyaltiesNanos := uint64(0)
 		var additionalRoyalties []*PublicKeyRoyaltyPair
-		for pkid, bps := range royaltyMap {
+		for pkidIter, bps := range royaltyMap {
+			pkid := pkidIter
 			royaltyNanos := IntDiv(
 				IntMul(
 					big.NewInt(int64(args.BidAmountNanos)),

diff --git a/lib/block_view_profile.go b/lib/block_view_profile.go
@@ -197,7 +197,13 @@ func (bav *UtxoView) GetPKIDForPublicKey(publicKey []byte) *PKIDEntry {
 	}
 }
 
-func (bav *UtxoView) GetPublicKeyForPKID(pkid *PKID) []byte {
+func (bav *UtxoView) GetPublicKeyForPKID(pkidArg *PKID) []byte {
+	// Put this check in place, since sometimes people accidentally
+	// pass a pointer that shouldn't be copied.
+	pkid := &PKID{}
+	if pkidArg != nil {
+		*pkid = *pkidArg
+	}
 	// If an entry exists in the in-memory map, return the value of that mapping.
 	mapValue, existsMapValue := bav.PKIDToPublicKey[*pkid]
 	if existsMapValue {