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-7.4'

Browse source 
* PHP-7.4:
  Fix #79199: curl_copy_handle() memory leak
This commit is contained in:
Christoph M. Becker 2020-03-12 11:28:39 +01:00
commit b612559a5b
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/curl/interface.c
View file

@ -2150,8 +2150,6 @@ PHP_FUNCTION(curl_copy_handle)
} }
#endif #endif
Z_ADDREF_P(zid);
ZVAL_RES(return_value, zend_register_resource(dupch, le_curl)); ZVAL_RES(return_value, zend_register_resource(dupch, le_curl));
dupch->res = Z_RES_P(return_value); dupch->res = Z_RES_P(return_value);
} }

24
ext/curl/tests/bug79199.phpt Normal file
View file

@ -0,0 +1,24 @@
--TEST--
Bug #79199 (curl_copy_handle() memory leak)
--SKIPIF--
<?php
if (!extension_loaded('curl')) die('skip curl extension not available');
?>
--FILE--
<?php
$mem_old = 0;
for($i = 0; $i < 50; ++$i) {
$c1 = curl_init();
$c2 = curl_copy_handle($c1);
curl_close($c2);
curl_close($c1);
$mem_new = memory_get_usage();
if ($mem_new <= $mem_old) {
break;
}
$mem_old = $mem_new;
}
echo $i < 50 ? "okay" : "leak", PHP_EOL;
?>
--EXPECT--
okay