summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierrick Charron <pierrick@php.net>2012-12-27 13:31:55 -0500
committerPierrick Charron <pierrick@php.net>2012-12-27 13:31:55 -0500
commitac3d227e28056bf5294a8a64e2f41ce2beebaa05 (patch)
tree5d5b74b5cc1ab76e3d8bf8840916d4d2d1850866
parent663434cd764b6030a4d9e6b565e0fff9eaa6a66c (diff)
downloadphp-git-ac3d227e28056bf5294a8a64e2f41ce2beebaa05.tar.gz
Fixed #63859 Memory leak when reusing curl-handle
When CURLOPT_POSTFIELDS is called more than once on the same curl handle, php/curl did not free the memory of the previous post data. This commit will fix the problem unless the curl handle was previously duplicated using the curl_copy_handle() function in which case we can not know if the post data is still in use or not by any curl handle
-rw-r--r--NEWS1
-rw-r--r--ext/curl/interface.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 208af93325..164daeb178 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ PHP NEWS
- cURL extension:
. Fixed bug (segfault due to libcurl connection caching). (Pierrick)
+ . Fixed bug #63859 (Memory leak when reusing curl-handle). (Pierrick)
. Fixed bug #63795 (CURL >= 7.28.0 no longer support value 1 for
CURLOPT_SSL_VERIFYHOST). (Pierrick)
. Fixed bug #63352 (Can't enable hostname validation when using curl stream
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index a23f859946..55102da2af 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -2131,6 +2131,9 @@ string_copy:
return 1;
}
+ if (Z_REFCOUNT_P(ch->clone) <= 1) {
+ zend_llist_clean(&ch->to_free->post);
+ }
zend_llist_add_element(&ch->to_free->post, &first);
error = curl_easy_setopt(ch->cp, CURLOPT_HTTPPOST, first);