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

Merge branch 'PHP-8.2' into PHP-8.3

Browse source 
* PHP-8.2:
  Fix GH-16174: Empty string is an invalid expression for phpdbg-ev
This commit is contained in:
Christoph M. Becker 2024-10-10 01:46:09 +02:00
commit 5c6fc09e45
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -9,6 +9,9 @@ PHP NEWS
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
curl_multi_add_handle fails). (timwolla) curl_multi_add_handle fails). (timwolla)
- PHPDBG:
. Fixed bug GH-16174 (Empty string is an invalid expression for ev). (cmb)
- XMLReader: - XMLReader:
. Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c). . Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
(nielsdos) (nielsdos)

2
sapi/phpdbg/phpdbg_lexer.l
View file

@ -82,7 +82,7 @@ ID [^ \r\n\t:#\000]+
GENERIC_ID ([^ \r\n\t:#\000"']|":\\")+|["]([^\n\000"\\]|"\\\\"|"\\"["])+["]|[']([^\n\000'\\]|"\\\\"|"\\"['])+['] GENERIC_ID ([^ \r\n\t:#\000"']|":\\")+|["]([^\n\000"\\]|"\\\\"|"\\"["])+["]|[']([^\n\000'\\]|"\\\\"|"\\"['])+[']
ADDR [0][x][a-fA-F0-9]+ ADDR [0][x][a-fA-F0-9]+
OPCODE (ZEND_|zend_)([A-Z_a-z])+ OPCODE (ZEND_|zend_)([A-Z_a-z])+
INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])+["]|[']("\\"[']|"\\\\"|[^\n\000'])+[']|[^\n\000#"'])+ INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])*["]|[']("\\"[']|"\\\\"|[^\n\000'])*[']|[^\n\000#"'])+
<!*> := yyleng = (size_t) YYCURSOR - (size_t) yytext; <!*> := yyleng = (size_t) YYCURSOR - (size_t) yytext;

10
sapi/phpdbg/tests/gh16174.phpt Normal file
View file

@ -0,0 +1,10 @@
--TEST--
GH-16174 (Empty string is an invalid expression for phpdbg-ev)
--PHPDBG--
ev $e = ""
ev $f = ''
--EXPECT--
prompt>
prompt>
prompt>
prompt>