Skip to content

Explicit octal notation for integers #6360

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
Girgias wants to merge 1 commit into from
Closed

Explicit octal notation for integers #6360

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
49 changes: 48 additions & 1 deletion Zend/zend_language_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,6 +1366,7 @@ DNUM ({LNUM}?"."{LNUM})|({LNUM}"."{LNUM}?)
EXPONENT_DNUM (({LNUM}|{DNUM})[eE][+-]?{LNUM})
HNUM "0x"[0-9a-fA-F]+(_[0-9a-fA-F]+)*
BNUM "0b"[01]+(_[01]+)*
ONUM "0o"[0-7]+(_[0-7]+)*
LABEL [a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*
WHITESPACE [ \n\r\t]+
TABS_AND_SPACES [ \t]*
Expand Down Expand Up @@ -1950,6 +1951,52 @@ NEWLINE ("\r"|"\n"|"\r\n")
}
}

<ST_IN_SCRIPTING>{ONUM} {
/* The +/- 2 skips "0o" */
size_t len = yyleng - 2;
char *end, *octal = yytext + 2;
zend_bool contains_underscores = (memchr(octal, '_', len) != NULL);

/* Skip any leading 0s */
while (len > 0 && (*octal == '0' || *octal == '_')) {
++octal;
--len;
}

if (contains_underscores) {
octal = estrndup(octal, len);
strip_underscores(octal, &len);
}

/* Reset errno */
Copy link
Member

@nikic nikic Jan 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is not needed ^^

Copy link
Member Author

@Girgias Girgias Jan 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will drop

errno = 0;

ZVAL_LONG(zendlval, ZEND_STRTOL(octal, &end, 8));

ZEND_ASSERT(end == octal + len);

if (!errno) {
if (contains_underscores) {
efree(octal);
}
RETURN_TOKEN_WITH_VAL(T_LNUMBER);
}

/* Overflow */
ZEND_ASSERT(errno == ERANGE);
/* Reset errno */
errno = 0;

/* zend_oct_strtod skips leading '0' */
ZVAL_DOUBLE(zendlval, zend_oct_strtod(octal, (const char **)&end));
ZEND_ASSERT(!errno);
ZEND_ASSERT(end == octal + len);
if (contains_underscores) {
efree(octal);
}
RETURN_TOKEN_WITH_VAL(T_DNUMBER);
}

<ST_IN_SCRIPTING>{LNUM} {
size_t len = yyleng;
char *end, *lnum = yytext;
Expand Down Expand Up @@ -2071,7 +2118,7 @@ string:
RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
}

<ST_VAR_OFFSET>{LNUM}|{HNUM}|{BNUM} { /* Offset must be treated as a string */
<ST_VAR_OFFSET>{LNUM}|{HNUM}|{BNUM}|{ONUM} { /* Offset must be treated as a string */
if (yyleng == 1) {
ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR((zend_uchar)*(yytext)));
} else {
Expand Down
3 changes: 0 additions & 3 deletions Zend/zend_strtod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4467,9 +4467,6 @@ ZEND_API double zend_oct_strtod(const char *str, const char **endptr)
return 0.0;
}

/* skip leading zero */
s++;

while ((c = *s++)) {
if (c < '0' || c > '7') {
/* break and return the current value if the number is not well-formed
Expand Down
7 changes: 7 additions & 0 deletions ext/filter/logical_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,13 @@ void php_filter_int(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
error = 1;
}
} else if (allow_octal) {
/* Support explicit octal prefix notation */
if (*p == 'o' || *p == 'O') {
p++; len--;
if (len == 0) {
RETURN_VALIDATION_FAILED
}
}
if (php_filter_parse_octal(p, len, &ctx_value) < 0) {
error = 1;
}
Expand Down
8 changes: 8 additions & 0 deletions ext/filter/tests/013.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ var_dump(filter_var(345, FILTER_VALIDATE_INT, array("options" => array("min_rang
var_dump(filter_var("0ff", FILTER_VALIDATE_INT));
var_dump(filter_var("010", FILTER_VALIDATE_INT));

// Explicit octal prefix
var_dump(filter_var("0o16", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL)));
var_dump(filter_var("0O16", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL)));
var_dump(filter_var("0o016", FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL)));

echo "Done\n";
?>
--EXPECT--
Expand Down Expand Up @@ -71,4 +76,7 @@ bool(false)
bool(false)
bool(false)
bool(false)
int(14)
int(14)
int(14)
Done
36 changes: 36 additions & 0 deletions ext/filter/tests/surprising_integer_literals.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
Surprising result with integer literals (hex/octal)
--SKIPIF--
<?php if (!extension_loaded("filter")) die("skip"); ?>
--FILE--
<?php
echo 'Hex', \PHP_EOL;
var_dump(filter_var('0x', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX));
var_dump(filter_var('0xg', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX));
var_dump(filter_var('0X', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX));
var_dump(filter_var('0Xg', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX));
var_dump(filter_var('', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_HEX));
echo 'Octal', \PHP_EOL;
var_dump(filter_var('0o', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('0og', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('0O', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('0Og', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('O', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('Og', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
var_dump(filter_var('', FILTER_VALIDATE_INT, FILTER_FLAG_ALLOW_OCTAL));
?>
--EXPECT--
Hex
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
Octal
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
bool(false)
3 changes: 3 additions & 0 deletions ext/gmp/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,9 @@ static zend_result convert_to_gmp(mpz_t gmpnumber, zval *val, zend_long base, ui
if ((base == 0 || base == 16) && (numstr[1] == 'x' || numstr[1] == 'X')) {
base = 16;
skip_lead = 1;
} else if ((base == 0 || base == 8) && (numstr[1] == 'o' || numstr[1] == 'O')) {
base = 8;
skip_lead = 1;
} else if ((base == 0 || base == 2) && (numstr[1] == 'b' || numstr[1] == 'B')) {
base = 2;
skip_lead = 1;
Expand Down
50 changes: 50 additions & 0 deletions ext/gmp/tests/gmp_init_integer_notations.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--TEST--
gmp_init() with various integer notations
--SKIPIF--
<?php if (!extension_loaded("gmp")) print "skip"; ?>
--FILE--
<?php

var_dump(gmp_init("0x16"));
var_dump(gmp_init("0X16"));
var_dump(gmp_init("0o16"));
var_dump(gmp_init("0o16"));
var_dump(gmp_init("016"));
var_dump(gmp_init("016"));
var_dump(gmp_init("0b11"));
var_dump(gmp_init("0b11"));

?>
--EXPECT--
object(GMP)#1 (1) {
["num"]=>
string(2) "22"
}
object(GMP)#1 (1) {
["num"]=>
string(2) "22"
}
object(GMP)#1 (1) {
["num"]=>
string(2) "14"
}
object(GMP)#1 (1) {
["num"]=>
string(2) "14"
}
object(GMP)#1 (1) {
["num"]=>
string(2) "14"
}
object(GMP)#1 (1) {
["num"]=>
string(2) "14"
}
object(GMP)#1 (1) {
["num"]=>
string(1) "3"
}
object(GMP)#1 (1) {
["num"]=>
string(1) "3"
}
33 changes: 33 additions & 0 deletions ext/gmp/tests/surprising_integer_literals.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
Surprising result with integer literals (hex/binary/octal)
--SKIPIF--
<?php if (!extension_loaded("gmp")) print "skip"; ?>
--FILE--
<?php

$values = [
'0x',
'0X',
'0b',
'0B',
'0o',
'0O',
''
];

foreach ($values as $value) {
try {
var_dump(gmp_init($value));
} catch (\ValueError $e) {
echo $e->getMessage(), \PHP_EOL;
}
}
?>
--EXPECT--
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
gmp_init(): Argument #1 ($num) is not an integer string
32 changes: 32 additions & 0 deletions ext/standard/tests/math/base_convert_variation2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
Test base_convert() function : strange literals
--FILE--
<?php
echo 'Binary to decimal:', \PHP_EOL;
var_dump(base_convert('0b', 2, 10));
var_dump(base_convert('0B', 2, 10));
var_dump(base_convert('', 2, 10));
echo 'Octal to decimal:', \PHP_EOL;
var_dump(base_convert('0o', 8, 10));
var_dump(base_convert('0O', 8, 10));
var_dump(base_convert('0', 8, 10)); // This is somehow deprecated????
Copy link
Member

@nikic nikic Jan 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's up with this comment?

Copy link
Member Author

@Girgias Girgias Jan 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right, that was when I messed up by confusing 0 and O ... will drop it

var_dump(base_convert('', 8, 10));
echo 'Hexadecimal to decimal:', \PHP_EOL;
var_dump(base_convert('0x', 16, 10));
var_dump(base_convert('0X', 16, 10));
var_dump(base_convert('', 16, 10));
?>
--EXPECT--
Binary to decimal:
string(1) "0"
string(1) "0"
string(1) "0"
Octal to decimal:
string(1) "0"
string(1) "0"
string(1) "0"
string(1) "0"
Hexadecimal to decimal:
string(1) "0"
string(1) "0"
string(1) "0"
18 changes: 18 additions & 0 deletions ext/standard/tests/math/base_convert_variation3.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
--TEST--
Test base_convert() function: converting '0'
--FILE--
<?php
echo 'Binary to decimal:', \PHP_EOL;
var_dump(base_convert('0', 2, 10));
echo 'Octal to decimal:', \PHP_EOL;
var_dump(base_convert('0', 8, 10));
echo 'Hexadecimal to decimal:', \PHP_EOL;
var_dump(base_convert('0', 16, 10));
?>
--EXPECT--
Binary to decimal:
string(1) "0"
Octal to decimal:
string(1) "0"
Hexadecimal to decimal:
string(1) "0"
14 changes: 14 additions & 0 deletions ext/standard/tests/math/bindec_variation2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Test bindec() function : strange literals
--FILE--
<?php

var_dump(bindec('0b'));
var_dump(bindec('0B'));
var_dump(bindec(''));

?>
--EXPECT--
int(0)
int(0)
int(0)
14 changes: 14 additions & 0 deletions ext/standard/tests/math/hexdec_variation2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
Test hexdec() function : strange literals
--FILE--
<?php

var_dump(hexdec('0x'));
var_dump(hexdec('0X'));
var_dump(hexdec(''));

?>
--EXPECT--
int(0)
int(0)
int(0)
16 changes: 16 additions & 0 deletions ext/standard/tests/math/octdec_variation2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
--TEST--
Test octdec() function : strange literals
--FILE--
<?php

var_dump(octdec('0o'));
var_dump(octdec('0O'));
var_dump(octdec('0'));
var_dump(octdec(''));

?>
--EXPECT--
int(0)
int(0)
int(0)
int(0)
Loading