archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix lexing of zero octal followed by whitespace

Browse source 
We'd call strtol starting at the whitespace, and strtol strips
whitespace...

Fixes oss-fuzz #29272.
This commit is contained in:
Nikita Popov 2021-01-05 12:24:23 +01:00
parent ed4f18b463
commit 0067c3ced1
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/tests/oct_whitespace.phpt Normal file
View file

@ -0,0 +1,8 @@
--TEST--
Octal literal followed by whitespace and another number
--FILE--
<?php
var_dump(0o0 2);
?>
--EXPECTF--
Parse error: syntax error, unexpected integer "2", expecting ")" in %s on line %d

5
Zend/zend_language_scanner.l
View file

@ -1963,6 +1963,11 @@ NEWLINE ("\r"|"\n"|"\r\n")
--len;
}
if (len == 0) {
ZVAL_LONG(zendlval, 0);
RETURN_TOKEN_WITH_VAL(T_LNUMBER);
}
if (contains_underscores) {
octal = estrndup(octal, len);
strip_underscores(octal, &len);