From cd9dba81c72c503b282634426c26a396d4645cc5 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <hi@m7.rs>
Date: Tue, 6 Jun 2023 17:02:01 -0300
Subject: [PATCH] small fixes

---
 Zend/zend_ini_scanner.l                                      | 5 ++---
 .../tests/general_functions/parse_ini_string_error.phpt      | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Zend/zend_ini_scanner.l b/Zend/zend_ini_scanner.l
index 41be059089c..44159297a04 100644
--- a/Zend/zend_ini_scanner.l
+++ b/Zend/zend_ini_scanner.l
@@ -360,7 +360,6 @@ TABS_AND_SPACES [ \t]
 WHITESPACE [ \t]+
 CONSTANT [a-zA-Z_][a-zA-Z0-9_]*
 LABEL_CHAR [^=\n\r\t;&|^$~(){}!"\[\]\x00]
-/* FIXME: Is this missing a \0? */
 LABEL ({LABEL_CHAR}+)
 TOKENS [:,.\[\]"'()&|^+-/*=%$!~<>?@{}]
 OPERATORS [&|^~()!]
@@ -372,7 +371,7 @@ RAW_VALUE_CHARS [^\n\r;\000]
 
 LITERAL_DOLLAR ("$"([^{\000]|("\\"{ANY_CHAR})))
 VALUE_CHARS         ([^$= \t\n\r;&|^~()!"'\000]|{LITERAL_DOLLAR})
-FALLBACK_CHARS		([^$\n\r;"'!}\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
+FALLBACK_CHARS		([^$\n\r;"'}\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 
 <!*> := yyleng = YYCURSOR - SCNG(yy_text);
@@ -600,7 +599,7 @@ end_raw_value_chars:
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
 
-<ST_VAR_FALLBACK>{FALLBACK_CHARS}+ { /* Same as above, but excluding '}' */
+<ST_VAR_FALLBACK>{FALLBACK_CHARS}+ { /* Same as below, but excluding '}' */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
 
diff --git a/ext/standard/tests/general_functions/parse_ini_string_error.phpt b/ext/standard/tests/general_functions/parse_ini_string_error.phpt
index 867aba1826c..0ff1be2530a 100644
--- a/ext/standard/tests/general_functions/parse_ini_string_error.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_string_error.phpt
@@ -4,7 +4,7 @@ Ini parsing errors should not result in memory leaks
 <?php
 var_dump(parse_ini_string('a="b'));
 var_dump(parse_ini_string('a=${b'));
-var_dump(parse_ini_string('a=${b!a'));
+var_dump(parse_ini_string('a=${b:-a'));
 ?>
 --EXPECTF--
 Warning: syntax error, unexpected end of file, expecting TC_DOLLAR_CURLY or TC_QUOTED_STRING or '"' in Unknown on line 1
@@ -15,6 +15,6 @@ Warning: syntax error, unexpected end of file, expecting TC_FALLBACK or '}' in U
  in %s on line %d
 bool(false)
 
-Warning: syntax error, unexpected end of file, expecting TC_FALLBACK or '}' in Unknown on line 1
+Warning: syntax error, unexpected TC_FALLBACK, expecting TC_VARNAME in Unknown on line 1
  in %s on line %d
 bool(false)