fix curl multi mem leak

swoole · Apr 20, 2021 · 91bf243 · 91bf243
1 parent a79bd50
commit 91bf243
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/ext-src/php_swoole_curl.h b/ext-src/php_swoole_curl.h
@@ -108,6 +108,10 @@ class Multi {
         curl_multi_setopt(multi_handle_, CURLMOPT_TIMERDATA, this);
     }
 
+    ~Multi() {
+        curl_multi_cleanup(multi_handle_);
+    }
+
     CURLM *get_multi_handle() {
         return multi_handle_;
     }

diff --git a/thirdparty/php/curl/interface.cc b/thirdparty/php/curl/interface.cc
@@ -2691,6 +2691,13 @@ void _php_curl_free(php_curl *ch) {
     curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION, curl_write_nothing);
     curl_easy_setopt(ch->cp, CURLOPT_WRITEFUNCTION, curl_write_nothing);
 
+    swoole::curl::Handle *handle = nullptr;
+    curl_easy_getinfo(ch->cp, CURLINFO_PRIVATE, &handle);
+
+    if (handle && handle->multi) {
+        handle->multi->remove_handle(ch);
+    }
+
     /* cURL destructors should be invoked only by last curl handle */
     if (--(*ch->clone) == 0) {
         zend_llist_clean(&ch->to_free->str);
@@ -2701,8 +2708,6 @@ void _php_curl_free(php_curl *ch) {
         efree(ch->to_free);
         efree(ch->clone);
 
-        swoole::curl::Handle *handle = nullptr;
-        curl_easy_getinfo(ch->cp, CURLINFO_PRIVATE, &handle);
         delete handle;
         curl_easy_setopt(ch->cp, CURLOPT_PRIVATE, nullptr);
     }

diff --git a/thirdparty/php/curl/multi.cc b/thirdparty/php/curl/multi.cc
@@ -731,7 +731,6 @@ static void _php_curl_multi_free(php_curlm *mh) {
             mh->multi->remove_handle(ch->cp);
         }
     }
-    curl_multi_cleanup(mh->multi->get_multi_handle());
     zend_llist_clean(&mh->easyh);
     if (mh->handlers->server_push) {
         zval_ptr_dtor(&mh->handlers->server_push->func_name);