Regex: Prevent accidently copying the underlying `regex_t`

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
(cherry picked from commit fef5b856a497eb4e4b691d3596535073d61aadcc)
Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/misc.cc b/pdns/misc.cc
index 9a2178f67647098b7b1f056052b2f28040729627..f74809490c30772700c7090733a6b348e8d5b05a 100644 (file)
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -928,17 +928,29 @@ bool readFileIfThere(const char* fname, std::string* line)
   return stringfgets(filePtr.get(), *line);
 }
 
-Regex::Regex(const string& expr)
+Regex::Regex(const string& expr):
+  d_preg(new regex_t)
 {
-  if (auto ret = regcomp(&d_preg, expr.c_str(), REG_ICASE|REG_NOSUB|REG_EXTENDED); ret != 0) {
+  if (auto ret = regcomp(d_preg.get(), expr.c_str(), REG_ICASE|REG_NOSUB|REG_EXTENDED); ret != 0) {
     std::array<char, 1024> errorBuffer{};
-    if (regerror(ret, &d_preg, errorBuffer.data(), errorBuffer.size()) > 0) {
+    if (regerror(ret, d_preg.get(), errorBuffer.data(), errorBuffer.size()) > 0) {
       throw PDNSException("Regular expression " + expr + " did not compile: " + errorBuffer.data());
     }
     throw PDNSException("Regular expression " + expr + " did not compile");
   }
 }
 
+/** call this to find out if 'line' matches your expression */
+bool Regex::match(const string &line) const
+{
+  return regexec(d_preg.get(), line.c_str(), 0, 0, 0) == 0;
+}
+
+bool Regex::match(const DNSName& name) const
+{
+  return match(name.toStringNoDot());
+}
+
 // if you end up here because valgrind told you were are doing something wrong
 // with msgh->msg_controllen, please refer to https://github.com/PowerDNS/pdns/pull/3962
 // first.

diff --git a/pdns/misc.hh b/pdns/misc.hh
index 19a15499c9873ab2a5309c7eeeffbe3539ed7bbe..e67054ff8f742d5eebacc7296e4821902cebfc5b 100644 (file)
--- a/pdns/misc.hh
+++ b/pdns/misc.hh
@@ -528,23 +528,25 @@ class Regex
 public:
   /** constructor that accepts the expression to regex */
   Regex(const string &expr);
-
-  ~Regex()
-  {
-    regfree(&d_preg);
-  }
+  Regex(const Regex&) = delete;
+  Regex& operator=(const Regex&) = delete;
+  Regex(Regex&& rhs) = default;
+  Regex& operator=(Regex&& rhs) = default;
+  ~Regex() = default;
   /** call this to find out if 'line' matches your expression */
-  bool match(const string &line) const
-  {
-    return regexec(&d_preg,line.c_str(),0,0,0)==0;
-  }
-  bool match(const DNSName& name) const
-  {
-    return match(name.toStringNoDot());
-  }
+  bool match(const string &line) const;
+  bool match(const DNSName& name) const;
 
 private:
-  regex_t d_preg;
+  struct Deleter
+  {
+    void operator()(regex_t* ptr) const noexcept {
+      regfree(ptr);
+      delete ptr;
+    }
+  };
+
+  std::unique_ptr<regex_t, Deleter> d_preg;
 };
 
 class SimpleMatch