From: Otto <otto.moerbeek@open-xchange.com>
Date: Mon, 29 Mar 2021 09:49:34 +0000 (+0200)
Subject: Zap tmp files; use random suffix and fix leak by using smart pointer.
X-Git-Tag: rec-4.4.3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e329a503a818981f1379e1448015e7d4ecfde214;p=thirdparty%2Fpdns.git

Zap tmp files; use random suffix and fix leak by using smart pointer.

(cherry picked from commit e672ad6db7e9d0a98569656a4c0701121715b842)
---

diff --git a/pdns/nod.cc b/pdns/nod.cc
index cc0b2761e2..63733a65fc 100644
--- a/pdns/nod.cc
+++ b/pdns/nod.cc
@@ -40,6 +40,17 @@ using namespace boost::filesystem;
 
 std::mutex PersistentSBF::d_cachedir_mutex;
 
+void PersistentSBF::remove_tmp_files()
+{
+  path p(d_cachedir);
+  Regex file_regex(d_prefix + ".*\\." + bf_suffix + "\\.[[:xdigit:]]{8}$");
+  for (directory_iterator i(p); i != directory_iterator(); ++i) {
+    if (is_regular_file(i->path()) && file_regex.match(i->path().filename().string())) {
+      remove(*i);
+    }
+  }
+}
+
 // This looks for an old (per-thread) snapshot. The first one it finds,
 // it restores from that. Then immediately snapshots with the current thread id,// before removing the old snapshot
 // In this way, we can have per-thread SBFs, but still snapshot and restore.
@@ -54,6 +65,7 @@ bool PersistentSBF::init(bool ignore_pid) {
     path p(d_cachedir);
     try {
       if (exists(p) && is_directory(p)) {
+        remove_tmp_files();
         path newest_file;
         std::time_t newest_time=time(nullptr);
         Regex file_regex(d_prefix + ".*\\." + bf_suffix + "$");
@@ -126,8 +138,7 @@ bool PersistentSBF::snapshotCurrent(std::thread::id tid)
     std::stringstream ss;
     ss << d_prefix << "_" << tid;
     f /= ss.str() + "_" + std::to_string(getpid()) + "." + bf_suffix;
-    path ftmp = f;
-    ftmp += ".tmp";
+    path ftmp(unique_path(f.string() + ".%%%%%%%%"));
     if (exists(p) && is_directory(p)) {
       try {
         std::ofstream ofile;
@@ -147,7 +158,14 @@ bool PersistentSBF::snapshotCurrent(std::thread::id tid)
           throw std::runtime_error("Failed to write to file:" + ftmp.string());
         }
         ofile.close();
-        rename(ftmp, f);
+        try {
+          rename(ftmp, f);
+        }
+        catch (const std::runtime_error& e) {
+          g_log<<Logger::Warning<<"NODDB snapshot: Cannot rename file: " << e.what() << endl;
+          remove(ftmp);
+          throw;
+        }
         return true;
       }
       catch (const std::runtime_error& e) {
diff --git a/pdns/nod.hh b/pdns/nod.hh
index ce32f12d25..a801b1a0e5 100644
--- a/pdns/nod.hh
+++ b/pdns/nod.hh
@@ -59,6 +59,8 @@ namespace nod {
       return d_sbf.testAndAdd(data); 
     }
   private:
+    void remove_tmp_files();
+
     bool d_init{false};
     bf::stableBF d_sbf; // Stable Bloom Filter
     std::string d_cachedir;
diff --git a/pdns/recursordist/stable-bloom.hh b/pdns/recursordist/stable-bloom.hh
index a6cc5720f6..9fc343f88b 100644
--- a/pdns/recursordist/stable-bloom.hh
+++ b/pdns/recursordist/stable-bloom.hh
@@ -123,13 +123,12 @@ public:
       throw std::runtime_error("SBF: read failed (file too short?)");
     }
     bitstr_len = ntohl(bitstr_len);
-    char* bitcstr = new char[bitstr_len];
-    is.read((char*)bitcstr, bitstr_len);
+    unique_ptr<char[]> bitcstr = make_unique<char[]>(bitstr_len);
+    is.read(bitcstr.get(), bitstr_len);
     if (is.fail()) {
       throw std::runtime_error("SBF: read failed (file too short?)");
     }
-    std::string bitstr(bitcstr, bitstr_len);
-    delete[] bitcstr;
+    std::string bitstr(bitcstr.get(), bitstr_len);
     stableBF tempbf(k, num_cells, p, bitstr);
     swap(tempbf);
   }