From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 21 Dec 2022 13:50:31 +0000 (+0100)
Subject: MiniCurl: Make it safe to reuse a MiniCurl object
X-Git-Tag: dnsdist-1.8.0-rc1~145^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fe3a254680c032184edd259ccc7f12e06ba065f;p=thirdparty%2Fpdns.git

MiniCurl: Make it safe to reuse a MiniCurl object
---

diff --git a/pdns/minicurl.cc b/pdns/minicurl.cc
index 65b7f71b36..2a39e6aca8 100644
--- a/pdns/minicurl.cc
+++ b/pdns/minicurl.cc
@@ -118,6 +118,15 @@ static string extractHostFromURL(const std::string& url)
 
 void MiniCurl::setupURL(const std::string& str, const ComboAddress* rem, const ComboAddress* src, int timeout, size_t byteslimit, bool fastopen, bool verify)
 {
+  if (!d_fresh) {
+    curl_easy_reset(getCURLPtr(d_curl));
+  }
+  else {
+    d_fresh = false;
+  }
+
+  clearHostsList();
+
   if (rem) {
     struct curl_slist *hostlist = nullptr; // THIS SHOULD BE FREED
 
diff --git a/pdns/minicurl.hh b/pdns/minicurl.hh
index 28e426a810..08c88a6d75 100644
--- a/pdns/minicurl.hh
+++ b/pdns/minicurl.hh
@@ -69,6 +69,7 @@ private:
 #endif
   std::string d_data;
   size_t d_byteslimit{};
+  bool d_fresh{true};
 
   void setupURL(const std::string& str, const ComboAddress* rem, const ComboAddress* src, int timeout, size_t byteslimit, bool fastopen, bool verify);
   void setHeaders(const MiniCurlHeaders& headers);