diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-20 08:39:13 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-03-20 08:39:18 +0100 |
| commit | 5c1a95812411b864ced43a151cf86cc49da48150 (patch) | |
| tree | 26a7f4a96cd23a5ce9003c22a236f3272b85c25d | |
| parent | 10b930dde8f14e9cb661810e97a33bbf144fc55c (diff) | |
| parent | d93b97fbcfdd5cd255a456ee4d8d6d8020103862 (diff) | |
Merge #10027: Set to nullptr after delete
d93b97f Set to nullptr after delete (practicalswift)
Tree-SHA512: 7201cef4541557ffe31f52ce7527c4b08a2ff5aa1eae5268bdfee5b4843881f8fd115257bef6d1b4dfb71166951950a912ce87aef160ca89c2ca2ae264cfab1b
| -rw-r--r-- | src/httpserver.cpp | 1 | ||||
| -rw-r--r-- | src/test/dbwrapper_tests.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/httpserver.cpp b/src/httpserver.cpp index dbd08ff2e1..799de1c2cb 100644 --- a/src/httpserver.cpp +++ b/src/httpserver.cpp @@ -475,6 +475,7 @@ void StopHTTPServer() LogPrint("http", "Waiting for HTTP worker threads to exit\n"); workQueue->WaitExit(); delete workQueue; + workQueue = nullptr; } if (eventBase) { LogPrint("http", "Waiting for HTTP event thread to exit\n"); diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp index 22c90bd95b..9d55beb8ea 100644 --- a/src/test/dbwrapper_tests.cpp +++ b/src/test/dbwrapper_tests.cpp @@ -141,6 +141,7 @@ BOOST_AUTO_TEST_CASE(existing_data_no_obfuscate) // Call the destructor to free leveldb LOCK delete dbw; + dbw = nullptr; // Now, set up another wrapper that wants to obfuscate the same directory CDBWrapper odbw(ph, (1 << 10), false, false, true); @@ -182,6 +183,7 @@ BOOST_AUTO_TEST_CASE(existing_data_reindex) // Call the destructor to free leveldb LOCK delete dbw; + dbw = nullptr; // Simulate a -reindex by wiping the existing data store CDBWrapper odbw(ph, (1 << 10), false, true, true); |