Skip to content

error when curl read func returns unexpected long #22757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sjord wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −0
Open

error when curl read func returns unexpected long #22757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,17 @@ static size_t curl_read(char *data, size_t size, size_t nmemb, void *ctx)
memcpy(data, Z_STRVAL(retval), length);
} else if (Z_TYPE(retval) == IS_LONG) {
length = Z_LVAL_P(&retval);

switch (length) {
// Acceptable long values:
case 0:
case CURL_READFUNC_ABORT:
case CURL_READFUNC_PAUSE:
break;
default:
zend_value_error("The CURLOPT_READFUNCTION callback must return a string or CURL_READFUNC_ABORT or CURL_READFUNC_PAUSE");
length = CURL_READFUNC_ABORT;
}
}
// TODO Do type error if invalid type?
zval_ptr_dtor(&retval);
Expand Down
30 changes: 30 additions & 0 deletions ext/curl/tests/curl_read_function_error_on_int.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
--TEST--
error when CURLOPT_READFUNCTION returns an integer
--EXTENSIONS--
curl
--FILE--
<?php
function custom_readfunction($oCurl, $hReadHandle, $iMaxOut)
{
static $size = 2;
return $size--;
}

include 'server.inc';
$host = curl_cli_server_start();
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=post");
curl_setopt($ch, CURLOPT_POST, ['f' => 'f']);
curl_setopt($ch, CURLOPT_TIMEOUT, 2);
curl_setopt($ch, CURLOPT_READFUNCTION, "custom_readfunction" );

try {
curl_exec($ch);
} catch (ValueError $e) {
echo $e->getMessage() . "\n";
}
var_dump(curl_error($ch));
?>
--EXPECT--
The CURLOPT_READFUNCTION callback must return a string or CURL_READFUNC_ABORT or CURL_READFUNC_PAUSE
string(29) "operation aborted by callback"
Loading