Skip to content

Add new zend APIs for bin2hex to remove ext/hash usage in various extensions #21724

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
LamentXU123 wants to merge 5 commits into
base: master
Choose a base branch
from
+37 −0
Open

Add new zend APIs for bin2hex to remove ext/hash usage in various extensions #21724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fea6742
add zend-apis
LamentXU123 Apr 11, 2026
e24a9d6
initial patch
LamentXU123 Apr 13, 2026
03205f1
Revert "initial patch"
LamentXU123 Apr 13, 2026
69b2b77
[skip ci] update upgrading.internals
LamentXU123 Apr 14, 2026
c879d72
[skip ci] make description clearer
LamentXU123 Apr 14, 2026
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
Prev Previous commit
Next Next commit
initial patch
  • Loading branch information
@LamentXU123
LamentXU123 committed Apr 13, 2026
commit e24a9d65c646df8c9eba19a5794625c2e1a31709
27 changes: 27 additions & 0 deletions ext/standard/tests/url/gh21738.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-21738 (Avoid UB when urldecode() inspects non-ASCII bytes)
--FILE--
<?php

$tests = [
"%\x80A",
"%A\x80",
"%\xFFA",
"%F\xFF",
];

foreach ($tests as $test) {
var_dump(bin2hex(urldecode($test)));
var_dump(bin2hex(rawurldecode($test)));
}

?>
--EXPECT--
string(6) "258041"
string(6) "258041"
string(6) "254180"
string(6) "254180"
string(6) "25ff41"
string(6) "25ff41"
string(6) "2546ff"
string(6) "2546ff"
8 changes: 4 additions & 4 deletions ext/standard/url.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,8 @@ PHPAPI size_t php_url_decode_ex(char *dest, const char *src, size_t src_len)
if (*data == '+') {
*dest = ' ';
}
else if (*data == '%' && src_len >= 2 && isxdigit((int) *(data + 1))
&& isxdigit((int) *(data + 2))) {
else if (*data == '%' && src_len >= 2 && isxdigit((unsigned char) *(data + 1))
&& isxdigit((unsigned char) *(data + 2))) {
*dest = (char) php_htoi(data + 1);
data += 2;
src_len -= 2;
Expand Down Expand Up @@ -664,8 +664,8 @@ PHPAPI size_t php_raw_url_decode_ex(char *dest, const char *src, size_t src_len)
const char *data = src;

while (src_len--) {
if (*data == '%' && src_len >= 2 && isxdigit((int) *(data + 1))
&& isxdigit((int) *(data + 2))) {
if (*data == '%' && src_len >= 2 && isxdigit((unsigned char) *(data + 1))
&& isxdigit((unsigned char) *(data + 2))) {
*dest = (char) php_htoi(data + 1);
data += 2;
src_len -= 2;
Expand Down
Loading