Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix memory leaks in php_http.c when call_user_function() fails
This commit is contained in:
Niels Dossche 2025-05-24 21:54:50 +02:00
commit ac3eb678aa
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5

View file

@ -411,6 +411,7 @@ int make_http_soap_request(zval *this_ptr,
} else { } else {
zval_ptr_dtor(&params[0]); zval_ptr_dtor(&params[0]);
zval_ptr_dtor(&func); zval_ptr_dtor(&func);
zval_ptr_dtor(&retval);
if (request != buf) { if (request != buf) {
zend_string_release_ex(request, 0); zend_string_release_ex(request, 0);
} }
@ -1329,6 +1330,7 @@ try_again:
} else { } else {
zval_ptr_dtor(&params[0]); zval_ptr_dtor(&params[0]);
zval_ptr_dtor(&func); zval_ptr_dtor(&func);
zval_ptr_dtor(&retval);
efree(content_encoding); efree(content_encoding);
zend_string_release_ex(http_headers, 0); zend_string_release_ex(http_headers, 0);
zend_string_release_ex(http_body, 0); zend_string_release_ex(http_body, 0);