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

Fixed bug #68937 (Segfault in curl_multi_exec)

Browse source
This commit is contained in:
Xinchen Hui 2015-01-30 13:12:58 +08:00
parent 56ab00b0fe
commit 73288bbea4
2 changed files with 38 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/curl/interface.c
View file

@ -1486,8 +1486,12 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
ZVAL_RES(&argv[0], ch->res);
Z_ADDREF(argv[0]);
ZVAL_RES(&argv[1], t->res);
Z_ADDREF(argv[1]);
if (t->res) {
ZVAL_RES(&argv[1], t->res);
Z_ADDREF(argv[1]);
} else {
ZVAL_NULL(&argv[1]);
}
ZVAL_LONG(&argv[2], (int)size * nmemb);
fci.size = sizeof(fci);

32
ext/curl/tests/bug68937.phpt Normal file
View file

@ -0,0 +1,32 @@
--TEST--
Bug # #68937 (Segfault in curl_multi_exec)
--SKIPIF--
<?php
if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
include 'skipif.inc';
?>
--FILE--
<?php
$ch = curl_init('http://www.google.com/');
curl_setopt_array($ch, array(
CURLOPT_HEADER => false,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_POST => true,
CURLOPT_INFILESIZE => 1,
CURLOPT_HTTPHEADER => array(
'Content-Length: 1',
),
CURLOPT_READFUNCTION => 'curl_read'
));
function curl_read($ch, $fp, $len) {
var_dump($fp);
exit;
}
curl_exec($ch);
curl_close($ch);
?>
--EXPECTF--
NULL