Skip to content

Commit 980d41c

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Fix phpGH-16174: Empty string is an invalid expression for phpdbg-ev
2 parents 7bf3f70 + 5c6fc09 commit 980d41c

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ PHP NEWS
99
. Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
1010
curl_multi_add_handle fails). (timwolla)
1111

12+
- PHPDBG:
13+
. Fixed bug GH-16174 (Empty string is an invalid expression for ev). (cmb)
14+
1215
- XMLReader:
1316
. Fixed bug GH-16292 (Segmentation fault in ext/xmlreader/php_xmlreader.c).
1417
(nielsdos)

sapi/phpdbg/phpdbg_lexer.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ ID [^ \r\n\t:#\000]+
8282
GENERIC_ID ([^ \r\n\t:#\000"']|":\\")+|["]([^\n\000"\\]|"\\\\"|"\\"["])+["]|[']([^\n\000'\\]|"\\\\"|"\\"['])+[']
8383
ADDR [0][x][a-fA-F0-9]+
8484
OPCODE (ZEND_|zend_)([A-Z_a-z])+
85-
INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])+["]|[']("\\"[']|"\\\\"|[^\n\000'])+[']|[^\n\000#"'])+
85+
INPUT ("\\"[#"']|["]("\\\\"|"\\"["]|[^\n\000"])*["]|[']("\\"[']|"\\\\"|[^\n\000'])*[']|[^\n\000#"'])+
8686
8787
<!*> := yyleng = (size_t) YYCURSOR - (size_t) yytext;
8888

sapi/phpdbg/tests/gh16174.phpt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--TEST--
2+
GH-16174 (Empty string is an invalid expression for phpdbg-ev)
3+
--PHPDBG--
4+
ev $e = ""
5+
ev $f = ''
6+
--EXPECT--
7+
prompt>
8+
prompt>
9+
prompt>
10+
prompt>

0 commit comments

Comments
 (0)