Merge #13265: wallet: Exit SyncMetaData if there are no transactions to sync

laanwj · laanwj · commit 1a8b12c69c01 · 2018-05-18T12:53:16.000+02:00
b0d2ca9 wallet: Exit SyncMetaData if there are no transactions to sync (Wladimir J. van der Laan) Pull request description: Instead of crash with an assertion error, simply exit the function `SyncMetaData` if there is no metadata to sync. Fixes #13110. Tree-SHA512: 44c4789497b5b63963bef66d8b695987dde80764199f6ea0f2c974be19d29c2663f32446a663a2ee9029e143e5d1d9e8a591e52e6e7e795b982782626bec25bb
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -549,7 +549,9 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran
         }
     }
 
-    assert(copyFrom);
+    if (!copyFrom) {
+        return;
+    }
 
     // Now copy data from copyFrom to rest:
     for (TxSpends::iterator it = range.first; it != range.second; ++it)

Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,9 @@ void CWallet::SyncMetaData(std::pair<TxSpends::iterator, TxSpends::iterator> ran`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`
`552`		`- assert(copyFrom);`
	`552`	`+ if (!copyFrom) {`
	`553`	`+ return;`
	`554`	`+ }`
`553`	`555`
`554`	`556`	`// Now copy data from copyFrom to rest:`
`555`	`557`	`for (TxSpends::iterator it = range.first; it != range.second; ++it)`