[Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull()

jonasschnelli · jonasschnelli · commit 68d7682b9f8c · 2016-07-15T10:33:25.000+02:00
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h
@@ -87,9 +87,8 @@ class CKeyMetadata
     }
     CKeyMetadata(int64_t nCreateTime_)
     {
-        nVersion = CKeyMetadata::CURRENT_VERSION;
+        SetNull();
         nCreateTime = nCreateTime_;
-        hdKeypath.clear();
     }
 
     ADD_SERIALIZE_METHODS;
@@ -111,6 +110,7 @@ class CKeyMetadata
         nVersion = CKeyMetadata::CURRENT_VERSION;
         nCreateTime = 0;
         hdKeypath.clear();
+        hdMasterKeyID.SetNull();
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,8 @@ class CKeyMetadata`
`87`	`87`	`}`
`88`	`88`	`CKeyMetadata(int64_t nCreateTime_)`
`89`	`89`	`{`
`90`		`- nVersion = CKeyMetadata::CURRENT_VERSION;`
	`90`	`+ SetNull();`
`91`	`91`	`nCreateTime = nCreateTime_;`
`92`		`- hdKeypath.clear();`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`ADD_SERIALIZE_METHODS;`
`@@ -111,6 +110,7 @@ class CKeyMetadata`
`111`	`110`	`nVersion = CKeyMetadata::CURRENT_VERSION;`
`112`	`111`	`nCreateTime = 0;`
`113`	`112`	`hdKeypath.clear();`
	`113`	`+ hdMasterKeyID.SetNull();`
`114`	`114`	`}`
`115`	`115`	`};`
`116`	`116`