tests: Fix dangling pwalletMain pointer in wallet tests

laanwj · laanwj · commit 75a109338fbb · 2017-02-27T13:15:39.000+01:00
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -397,6 +397,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
 
     {
         CWallet wallet;
+        CWallet *backup = ::pwalletMain;
         ::pwalletMain = &wallet;
         UniValue key;
         key.setObject();
@@ -412,6 +413,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)
 
         UniValue response = importmulti(request);
         BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));
+        ::pwalletMain = backup;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)`
`397`	`397`
`398`	`398`	`{`
`399`	`399`	`CWallet wallet;`
	`400`	`+ CWallet *backup = ::pwalletMain;`
`400`	`401`	`::pwalletMain = &wallet;`
`401`	`402`	`UniValue key;`
`402`	`403`	`key.setObject();`
`@@ -412,6 +413,7 @@ BOOST_FIXTURE_TEST_CASE(rescan, TestChain100Setup)`
`412`	`413`
`413`	`414`	`UniValue response = importmulti(request);`
`414`	`415`	`BOOST_CHECK_EQUAL(response.write(), strprintf("[{\"success\":false,\"error\":{\"code\":-1,\"message\":\"Failed to rescan before time %d, transactions may be missing.\"}}]", newTip->GetBlockTimeMax()));`
	`416`	`+ ::pwalletMain = backup;`
`415`	`417`	`}`
`416`	`418`	`}`
`417`	`419`