Skip to content

Stdlib: curl_escape/unescape(null) TypeError on PROFILE=8.4 (#20695) #20731

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

Merged
PurHur merged 1 commit into from
Jul 18, 2026
Merged

Stdlib: curl_escape/unescape(null) TypeError on PROFILE=8.4 (#20695) #20731

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
13 changes: 11 additions & 2 deletions ext/curl/curl_escape.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public function execute(Frame $frame): void
if (null === $frame->returnVar) {
return;
}
$value = VmString::coerceStringBuiltinArg(
// Z_PARAM_STR — null TypeError on 8.4 forward profile (#20695, ext/curl/interface.c)
$value = VmString::coerceZparamStrBuiltinArg(
$frame->calledArgs[1],
'curl_escape',
1,
Expand All @@ -56,7 +57,15 @@ public function call(Context $context, JITVariable ...$args): Value
}
// Handle is required for php-src-strict arity/type; encoding matches curl_easy_escape
// unreserved set (rawurlencode) and does not depend on handle state.
$str = JitStringBuiltinArg::lower($context, $args[1], 'curl_escape', 1, 'string');
// Z_PARAM_STR — null TypeError on 8.4 forward profile (#20695).
// Early-return like urlencode: after TypeError+abort, do not link rawurlencode (#20695 AOT).
if (
(JITVariable::TYPE_NULL === $args[1]->type || ($args[1]->isNullConstant ?? false))
&& ($context->callerStrictTypes || JitStringBuiltinArg::requiresZparamStrStrictNullOnForwardProfile())
) {
return JitStringBuiltinArg::lowerZparamStr($context, $args[1], 'curl_escape', 1, 'string');
}
$str = JitStringBuiltinArg::lowerZparamStr($context, $args[1], 'curl_escape', 1, 'string');

return JitUrlencode::rawurlencode($context, $str);
}
Expand Down
13 changes: 11 additions & 2 deletions ext/curl/curl_unescape.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public function execute(Frame $frame): void
if (null === $frame->returnVar) {
return;
}
$value = VmString::coerceStringBuiltinArg(
// Z_PARAM_STR — null TypeError on 8.4 forward profile (#20695, ext/curl/interface.c)
$value = VmString::coerceZparamStrBuiltinArg(
$frame->calledArgs[1],
'curl_unescape',
1,
Expand All @@ -54,7 +55,15 @@ public function call(Context $context, JITVariable ...$args): Value
\count($args)
));
}
$str = JitStringBuiltinArg::lower($context, $args[1], 'curl_unescape', 1, 'string');
// Z_PARAM_STR — null TypeError on 8.4 forward profile (#20695).
// Early-return like urlencode: after TypeError+abort, do not link rawurldecode (#20695 AOT).
if (
(JITVariable::TYPE_NULL === $args[1]->type || ($args[1]->isNullConstant ?? false))
&& ($context->callerStrictTypes || JitStringBuiltinArg::requiresZparamStrStrictNullOnForwardProfile())
) {
return JitStringBuiltinArg::lowerZparamStr($context, $args[1], 'curl_unescape', 1, 'string');
}
$str = JitStringBuiltinArg::lowerZparamStr($context, $args[1], 'curl_unescape', 1, 'string');

return JitUrlencode::rawurldecode($context, $str);
}
Expand Down
15 changes: 15 additions & 0 deletions test/compliance/cases/stdlib/curl_escape_null.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--TEST--
stdlib curl_escape()/curl_unescape(null) — coerce under 8.2 profile (#20695, ext/curl/interface.c)
--ENV--
PHP_COMPILER_PROFILE=8.2
--FILE--
<?php
$ch = curl_init();
var_export(curl_escape($ch, null));
echo "\n";
var_export(curl_unescape($ch, null));
echo "\n";
?>
--EXPECT--
''
''
23 changes: 23 additions & 0 deletions test/compliance/cases/stdlib/curl_escape_null_forward84.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
stdlib curl_escape()/curl_unescape(null) — TypeError on 8.4 forward profile (#20695, ext/curl/interface.c)
--ENV--
PHP_COMPILER_PROFILE=8.4
--FILE--
<?php
$ch = curl_init();
try {
curl_escape($ch, null);
echo "escape_uncaught\n";
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
curl_unescape($ch, null);
echo "unescape_uncaught\n";
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
curl_escape(): Argument #2 ($string) must be of type string, null given
curl_unescape(): Argument #2 ($string) must be of type string, null given
24 changes: 24 additions & 0 deletions test/compliance/cases/stdlib/curl_escape_null_forward84_jit.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
stdlib curl_escape()/curl_unescape(null) — TypeError on 8.4 forward profile JIT (#20695, ext/curl/interface.c)
--ENV--
PHP_COMPILER_PROFILE=8.4
--JIT--
--FILE--
<?php
$ch = curl_init();
try {
curl_escape($ch, null);
echo "escape_uncaught\n";
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
try {
curl_unescape($ch, null);
echo "unescape_uncaught\n";
} catch (TypeError $e) {
echo $e->getMessage(), "\n";
}
?>
--EXPECT--
curl_escape(): Argument #2 ($string) must be of type string, null given
curl_unescape(): Argument #2 ($string) must be of type string, null given
12 changes: 12 additions & 0 deletions test/fixtures/aot/cases/curl_escape_null_forward84.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
--TEST--
AOT: curl_escape(null) — TypeError on 8.4 forward profile (#20695, ext/curl/interface.c)
--ENV--
PHP_COMPILER_PROFILE=8.4
--FILE--
<?php
// JIT/AOT encode path does not require a live CurlHandle (curl_init is VM-only; #6322).
$h = 0;
curl_escape($h, null);
--EXPECT--
--EXPECT_EXIT--
255