Merge pull request #4546

09c744c Make sure CAutoFile for fees estimate goes out of scope (Pieter Wuille)

src/init.cpp

@@ -127,12 +127,14 @@ void Shutdown()
     StopNode();
     UnregisterNodeSignals(GetNodeSignals());
 
-    boost::filesystem::path est_path = GetDataDir() / FEE_ESTIMATES_FILENAME;
+    {
-    CAutoFile est_fileout = CAutoFile(fopen(est_path.string().c_str(), "wb"), SER_DISK, CLIENT_VERSION);
+        boost::filesystem::path est_path = GetDataDir() / FEE_ESTIMATES_FILENAME;
-    if (est_fileout)
+        CAutoFile est_fileout(fopen(est_path.string().c_str(), "wb"), SER_DISK, CLIENT_VERSION);
-        mempool.WriteFeeEstimates(est_fileout);
+        if (est_fileout)
-    else
+            mempool.WriteFeeEstimates(est_fileout);
-        LogPrintf("%s: Failed to write fee estimates to %s\n", __func__, est_path.string());
+        else
+            LogPrintf("%s: Failed to write fee estimates to %s\n", __func__, est_path.string());
+    }
 
     {
         LOCK(cs_main);