Commitf2fbb75

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: curl: Prevent a CurlMultiHandle from holding onto a CurlHandle if `add_handle` fails (#16302)

2 parents1f84f5c +a1e9662 commitf2fbb75Copy full SHA for f2fbb75

File tree

+62

-5

lines changed

+62

-5

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,10 @@ PHP NEWS`
`2`	`2`	`\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|\|`
`3`	`3`	`?? ??? ????, PHP 8.4.0RC3`
`4`	`4`
	`5`	`+- Curl:`
	`6`	`+ . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if`
	`7`	`+ curl_multi_add_handle fails). (timwolla)`
	`8`	`+`
`5`	`9`	`- XMLReader:`
`6`	`10`	`. Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).`
`7`	`11`	`(nielsdos)`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,14 @@ PHP_FUNCTION(curl_multi_add_handle)`
`97`	`97`
`98`	`98`	`_php_curl_cleanup_handle(ch);`
`99`	`99`
`100`		`-Z_ADDREF_P(z_ch);`
`101`		`-zend_llist_add_element(&mh->easyh,z_ch);`
`102`		`-`
`103`	`100`	`error=curl_multi_add_handle(mh->multi,ch->cp);`
`104`	`101`	`SAVE_CURLM_ERROR(mh,error);`
`105`	`102`
	`103`	`+if (error==CURLM_OK) {`
	`104`	`+Z_ADDREF_P(z_ch);`
	`105`	`+zend_llist_add_element(&mh->easyh,z_ch);`
	`106`	`+}`
	`107`	`+`
`106`	`108`	`RETURN_LONG((zend_long)error);`
`107`	`109`	`}`
`108`	`110`	`/* }}} */`
`@@ -164,9 +166,11 @@ PHP_FUNCTION(curl_multi_remove_handle)`
`164`	`166`	`error=curl_multi_remove_handle(mh->multi,ch->cp);`
`165`	`167`	`SAVE_CURLM_ERROR(mh,error);`
`166`	`168`
`167`		`-RETVAL_LONG((zend_long)error);`
`168`		`-zend_llist_del_element(&mh->easyh,z_ch, (int ()(void,void*))curl_compare_objects);`
	`169`	`+if (error==CURLM_OK) {`
	`170`	`+zend_llist_del_element(&mh->easyh,z_ch, (int ()(void,void*))curl_compare_objects);`
	`171`	`+}`
`169`	`172`
	`173`	`+RETURN_LONG((zend_long)error);`
`170`	`174`	`}`
`171`	`175`	`/* }}} */`
`172`	`176`

Lines changed: 49 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,49 @@`
	`1`	`+--TEST--`
	`2`	`+curl_multi_add_handle does not hold onto the handle on failure`
	`3`	`+--EXTENSIONS--`
	`4`	`+curl`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+`
	`8`	`+class MyClass {`
	`9`	`+publicfunction__destruct() {`
	`10`	`+echo__METHOD__,PHP_EOL;`
	`11`	`+ }`
	`12`	`+}`
	`13`	`+`
	`14`	`+$urls = [`
	`15`	`+"file://".__DIR__."/curl_testdata1.txt",`
	`16`	`+"file://".__DIR__."/curl_testdata2.txt",`
	`17`	`+];`
	`18`	`+`
	`19`	`+$mh =curl_multi_init();`
	`20`	`+`
	`21`	`+$toRemove = [];`
	`22`	`+foreach ($urlsas$url) {`
	`23`	`+$ch =curl_init($url);`
	`24`	`+curl_setopt($ch,CURLOPT_PRIVATE,newMyClass());`
	`25`	`+`
	`26`	`+if (curl_multi_add_handle($mh,$ch) ==CURLM_OK) {`
	`27`	`+$toRemove[] =$ch;`
	`28`	`+ }`
	`29`	`+if (curl_multi_add_handle($mh,$ch) ==CURLM_OK) {`
	`30`	`+$toRemove[] =$ch;`
	`31`	`+ }`
	`32`	`+`
	`33`	`+ unset($ch);`
	`34`	`+}`
	`35`	`+`
	`36`	`+echo"Removing",PHP_EOL;`
	`37`	`+foreach ($toRemoveas$i =>$ch) {`
	`38`	`+curl_multi_remove_handle($mh,$ch);`
	`39`	`+ unset($ch);`
	`40`	`+ unset($toRemove[$i]);`
	`41`	`+}`
	`42`	`+echo"Removed",PHP_EOL;`
	`43`	`+`
	`44`	`+?>`
	`45`	`+--EXPECTF--`
	`46`	`+Removing`
	`47`	`+MyClass::__destruct`
	`48`	`+MyClass::__destruct`
	`49`	`+Removed`

Comments

(0)