Skip to content

ext/bcmath: Fix bc_str2num accepting strings with embedded null bytes #21492

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
jorgsowa wants to merge 1 commit into
base: master
Choose a base branch
from
+62 −3
Open

ext/bcmath: Fix bc_str2num accepting strings with embedded null bytes #21492

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
6 changes: 3 additions & 3 deletions ext/bcmath/libbcmath/src/str2num.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ bool bc_str2num(bc_num *num, const char *str, const char *end, size_t scale, siz
const char *decimal_point = (*ptr == '.') ? ptr : NULL;

/* If a non-digit and non-decimal-point indicator is in the string, i.e. an invalid character */
if (UNEXPECTED(!decimal_point && *ptr != '\0')) {
if (UNEXPECTED(!decimal_point && ptr != end)) {
goto fail;
}

Expand All @@ -140,7 +140,7 @@ bool bc_str2num(bc_num *num, const char *str, const char *end, size_t scale, siz
/* search */
fractional_ptr = fractional_end = decimal_point + 1;
/* For strings that end with a decimal point, such as "012." */
if (UNEXPECTED(*fractional_ptr == '\0')) {
if (UNEXPECTED(fractional_ptr == end)) {
if (full_scale) {
*full_scale = 0;
}
Expand All @@ -149,7 +149,7 @@ bool bc_str2num(bc_num *num, const char *str, const char *end, size_t scale, siz

/* validate */
fractional_end = bc_count_digits(fractional_ptr, end);
if (UNEXPECTED(*fractional_end != '\0')) {
if (UNEXPECTED(fractional_end != end)) {
/* invalid num */
goto fail;
}
Expand Down
59 changes: 59 additions & 0 deletions ext/bcmath/tests/sec_embedded_null_truncation.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
--TEST--
bcmath strings with embedded null bytes must be rejected as not well-formed
--EXTENSIONS--
bcmath
--FILE--
<?php
$cases = [
"100\x005",
"1.2\x003",
"\x00123",
];

$calls = [
fn($s) => bcadd($s, "0"),
fn($s) => bcsub($s, "0"),
fn($s) => bcmul($s, "1"),
fn($s) => bcdiv($s, "1"),
fn($s) => bcmod($s, "7"),
fn($s) => bcpow($s, "1"),
fn($s) => bccomp($s, "0"),
fn($s) => bcsqrt($s),
];

foreach ($cases as $s) {
foreach ($calls as $fn) {
try {
$fn($s);
echo "FAIL: accepted\n";
} catch (\ValueError $e) {
echo $e->getMessage() . "\n";
}
}
}
?>
--EXPECT--
bcadd(): Argument #1 ($num1) is not well-formed
bcsub(): Argument #1 ($num1) is not well-formed
bcmul(): Argument #1 ($num1) is not well-formed
bcdiv(): Argument #1 ($num1) is not well-formed
bcmod(): Argument #1 ($num1) is not well-formed
bcpow(): Argument #1 ($num) is not well-formed
bccomp(): Argument #1 ($num1) is not well-formed
bcsqrt(): Argument #1 ($num) is not well-formed
bcadd(): Argument #1 ($num1) is not well-formed
bcsub(): Argument #1 ($num1) is not well-formed
bcmul(): Argument #1 ($num1) is not well-formed
bcdiv(): Argument #1 ($num1) is not well-formed
bcmod(): Argument #1 ($num1) is not well-formed
bcpow(): Argument #1 ($num) is not well-formed
bccomp(): Argument #1 ($num1) is not well-formed
bcsqrt(): Argument #1 ($num) is not well-formed
bcadd(): Argument #1 ($num1) is not well-formed
bcsub(): Argument #1 ($num1) is not well-formed
bcmul(): Argument #1 ($num1) is not well-formed
bcdiv(): Argument #1 ($num1) is not well-formed
bcmod(): Argument #1 ($num1) is not well-formed
bcpow(): Argument #1 ($num) is not well-formed
bccomp(): Argument #1 ($num1) is not well-formed
bcsqrt(): Argument #1 ($num) is not well-formed
Loading