archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  curl: Prevent a CurlMultiHandle from holding onto a CurlHandle if `add_handle` fails (#16302)
This commit is contained in:
Tim Düsterhus 2024-10-09 09:38:05 +02:00
commit f2fbb75f30
No known key found for this signature in database
3 changed files with 62 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -2,6 +2,10 @@ PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.4.0RC3 ?? ??? ????, PHP 8.4.0RC3
- Curl:
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
curl_multi_add_handle fails). (timwolla)
- XMLReader: - XMLReader:
. Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c). . Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
(nielsdos) (nielsdos)

12
ext/curl/multi.c
View file

@ -97,12 +97,14 @@ PHP_FUNCTION(curl_multi_add_handle)
_php_curl_cleanup_handle(ch); _php_curl_cleanup_handle(ch);
Z_ADDREF_P(z_ch);
zend_llist_add_element(&mh->easyh, z_ch);
error = curl_multi_add_handle(mh->multi, ch->cp); error = curl_multi_add_handle(mh->multi, ch->cp);
SAVE_CURLM_ERROR(mh, error); SAVE_CURLM_ERROR(mh, error);
if (error == CURLM_OK) {
Z_ADDREF_P(z_ch);
zend_llist_add_element(&mh->easyh, z_ch);
}
RETURN_LONG((zend_long) error); RETURN_LONG((zend_long) error);
} }
/* }}} */ /* }}} */
@ -164,9 +166,11 @@ PHP_FUNCTION(curl_multi_remove_handle)
error = curl_multi_remove_handle(mh->multi, ch->cp); error = curl_multi_remove_handle(mh->multi, ch->cp);
SAVE_CURLM_ERROR(mh, error); SAVE_CURLM_ERROR(mh, error);
RETVAL_LONG((zend_long) error); if (error == CURLM_OK) {
zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects); zend_llist_del_element(&mh->easyh, z_ch, (int (*)(void *, void *))curl_compare_objects);
}
RETURN_LONG((zend_long) error);
} }
/* }}} */ /* }}} */

49
ext/curl/tests/curl_multi_add_handle_lifecycle.phpt Normal file
View file

@ -0,0 +1,49 @@
--TEST--
curl_multi_add_handle does not hold onto the handle on failure
--EXTENSIONS--
curl
--FILE--
<?php
class MyClass {
public function __destruct() {
echo __METHOD__, PHP_EOL;
}
}
$urls = [
"file://".__DIR__."/curl_testdata1.txt",
"file://".__DIR__."/curl_testdata2.txt",
];
$mh = curl_multi_init();
$toRemove = [];
foreach ($urls as $url) {
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_PRIVATE, new MyClass());
if (curl_multi_add_handle($mh, $ch) == CURLM_OK) {
$toRemove[] = $ch;
}
if (curl_multi_add_handle($mh, $ch) == CURLM_OK) {
$toRemove[] = $ch;
}
unset($ch);
}
echo "Removing", PHP_EOL;
foreach ($toRemove as $i => $ch) {
curl_multi_remove_handle($mh, $ch);
unset($ch);
unset($toRemove[$i]);
}
echo "Removed", PHP_EOL;
?>
--EXPECTF--
Removing
MyClass::__destruct
MyClass::__destruct
Removed