Skip to content

Base Convert changes for PHP 7.4 #4328

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

Closed
wants to merge 5 commits into from
Closed

Base Convert changes for PHP 7.4 #4328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98d2c65
Base Convert changes for PHP 7.4
exussum12 Jun 28, 2019
df411e6
Adding missing test
exussum12 Jun 28, 2019
7899294
Fix test location
exussum12 Jun 28, 2019
70d6d09
Suggested changes
exussum12 Jul 5, 2019
ba9210c
Fix 32 bit build
exussum12 Jul 5, 2019
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
31 changes: 25 additions & 6 deletions ext/standard/math.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,22 +850,33 @@ PHPAPI int _php_math_basetozval(zval *arg, int base, zval *ret)
{
zend_long num = 0;
double fnum = 0;
zend_long i;
int mode = 0;
char c, *s;
char c, *s, *e;
zend_long cutoff;
int cutlim;
int invalidchars = 0;

if (Z_TYPE_P(arg) != IS_STRING || base < 2 || base > 36) {
return FAILURE;
}

s = Z_STRVAL_P(arg);
e = s + Z_STRLEN_P(arg);

/* Skip leading whitespace */
while (s < e && isspace(*s)) s++;
/* Skip trailing whitespace */
while (s < e && isspace(*(e-1))) e--;

if (e - s >= 2) {
if (base == 16 && s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) s += 2;
if (base == 8 && s[0] == '0' && (s[1] == 'o' || s[1] == 'O')) s += 2;
if (base == 2 && s[0] == '0' && (s[1] == 'b' || s[1] == 'B')) s += 2;
}

cutoff = ZEND_LONG_MAX / base;
cutlim = ZEND_LONG_MAX % base;

for (i = Z_STRLEN_P(arg); i > 0; i--) {
while (s < e) {
c = *s++;

/* might not work for EBCDIC */
Expand All @@ -875,11 +886,15 @@ PHPAPI int _php_math_basetozval(zval *arg, int base, zval *ret)
c -= 'A' - 10;
else if (c >= 'a' && c <= 'z')
c -= 'a' - 10;
else
else {
invalidchars++;
continue;
}

if (c >= base)
if (c >= base) {
invalidchars++;
continue;
}

switch (mode) {
case 0: /* Integer */
Expand All @@ -896,6 +911,10 @@ PHPAPI int _php_math_basetozval(zval *arg, int base, zval *ret)
}
}

if (invalidchars > 0) {
zend_error(E_DEPRECATED, "Invalid characters passed for attempted conversion, these have been ignored");
}

if (mode == 1) {
ZVAL_DOUBLE(ret, fnum);
} else {
Expand Down
Loading