fix curl multi mem leak

matyhtf · matyhtf · commit 91bf243458f7 · 2021-04-20T11:53:59.000+08:00
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);

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,10 @@ class Multi {`
`108`	`108`	`curl_multi_setopt(multi_handle_, CURLMOPT_TIMERDATA, this);`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ ~Multi() {`
	`112`	`+ curl_multi_cleanup(multi_handle_);`
	`113`	`+ }`
	`114`	`+`
`111`	`115`	`CURLM *get_multi_handle() {`
`112`	`116`	`return multi_handle_;`
`113`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,6 @@ static void _php_curl_multi_free(php_curlm *mh) {`
`731`	`731`	`mh->multi->remove_handle(ch->cp);`
`732`	`732`	`}`
`733`	`733`	`}`
`734`		`- curl_multi_cleanup(mh->multi->get_multi_handle());`
`735`	`734`	`zend_llist_clean(&mh->easyh);`
`736`	`735`	`if (mh->handlers->server_push) {`
`737`	`736`	`zval_ptr_dtor(&mh->handlers->server_push->func_name);`