summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--ext/curl/multi.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5ad8082860..7d0169d226 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ PHP NEWS
- IMAP:
. Fixed bug #70158 (Building with static imap fails). (cmb)
+ . Fixed bug #69998 (curl multi leaking memory). (Pierrick)
- Opcache:
. Fixed bug #70111 (Segfault when a function uses both an explicit return
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
index d5916d6f58..8f52b24a37 100644
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@@ -116,7 +116,7 @@ void _php_curl_multi_cleanup_list(void *data) /* {{{ */
return;
}
- zend_list_close(Z_RES_P(z_ch));
+ zend_list_delete(Z_RES_P(z_ch));
}
/* }}} */
@@ -151,7 +151,7 @@ PHP_FUNCTION(curl_multi_remove_handle)
}
RETVAL_LONG((zend_long)curl_multi_remove_handle(mh->multi, ch->cp));
- zend_llist_del_element(&mh->easyh, &z_ch, (int (*)(void *, void *))curl_compare_resources);
+ zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_resources);
}
/* }}} */