Zend/zend_ini_scanner: parse const strings

Author: MaxKellermann

Zend/zend_globals.h

@@ -297,11 +297,11 @@ struct _zend_ini_scanner_globals {
 	zend_file_handle *yy_out;
 
 	unsigned int yy_leng;
-	unsigned char *yy_start;
-	unsigned char *yy_text;
-	unsigned char *yy_cursor;
-	unsigned char *yy_marker;
-	unsigned char *yy_limit;
+	const unsigned char *yy_start;
+	const unsigned char *yy_text;
+	const unsigned char *yy_cursor;
+	const unsigned char *yy_marker;
+	const unsigned char *yy_limit;
 	int yy_state;
 	zend_stack state_stack;
 

Zend/zend_ini.h

@@ -233,7 +233,7 @@ END_EXTERN_C()
 typedef void (*zend_ini_parser_cb_t)(zval *arg1, zval *arg2, zval *arg3, int callback_type, void *arg);
 BEGIN_EXTERN_C()
 ZEND_API int zend_parse_ini_file(zend_file_handle *fh, bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg);
-ZEND_API int zend_parse_ini_string(char *str, bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg);
+ZEND_API int zend_parse_ini_string(const char *str, bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg);
 END_EXTERN_C()
 
 /* INI entries */

Zend/zend_ini_parser.y

@@ -238,7 +238,7 @@ ZEND_API zend_result zend_parse_ini_file(zend_file_handle *fh, bool unbuffered_e
 /* }}} */
 
 /* {{{ zend_parse_ini_string() */
-ZEND_API zend_result zend_parse_ini_string(char *str, bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
+ZEND_API zend_result zend_parse_ini_string(const char *str, bool unbuffered_errors, int scanner_mode, zend_ini_parser_cb_t ini_parser_cb, void *arg)
 {
 	int retval;
 	zend_ini_parser_param ini_parser_param;

Zend/zend_ini_scanner.h

@@ -29,7 +29,7 @@ BEGIN_EXTERN_C()
 ZEND_COLD int zend_ini_scanner_get_lineno(void);
 ZEND_COLD const char *zend_ini_scanner_get_filename(void);
 zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mode);
-zend_result zend_ini_prepare_string_for_scanning(char *str, int scanner_mode);
+zend_result zend_ini_prepare_string_for_scanning(const char *str, int scanner_mode);
 int ini_lex(zval *ini_lval);
 void shutdown_ini_scanner(void);
 END_EXTERN_C()

Zend/zend_ini_scanner.l

@@ -55,9 +55,9 @@
 /* emulate flex constructs */
 #define BEGIN(state) YYSETCONDITION(STATE(state))
 #define YYSTATE      YYGETCONDITION()
-#define yytext       ((char*)SCNG(yy_text))
+#define yytext       ((const char*)SCNG(yy_text))
 #define yyleng       SCNG(yy_leng)
-#define yyless(x)    do {	YYCURSOR = (unsigned char*)yytext + x; \
+#define yyless(x)    do {	YYCURSOR = (const unsigned char*)yytext + x; \
 							yyleng   = (unsigned int)x; } while(0)
 
 /* #define yymore()     goto yymore_restart */
@@ -208,9 +208,9 @@ static void yy_pop_state(void)
 	zend_stack_del_top(&SCNG(state_stack));
 }
 
-static void yy_scan_buffer(char *str, unsigned int len)
+static void yy_scan_buffer(const char *str, unsigned int len)
 {
-	YYCURSOR = (YYCTYPE*)str;
+	YYCURSOR = (const YYCTYPE*)str;
 	SCNG(yy_start) = YYCURSOR;
 	YYLIMIT  = YYCURSOR + len;
 }
@@ -288,7 +288,7 @@ zend_result zend_ini_open_file_for_scanning(zend_file_handle *fh, int scanner_mo
 /* }}} */
 
 /* {{{ zend_ini_prepare_string_for_scanning() */
-zend_result zend_ini_prepare_string_for_scanning(char *str, int scanner_mode)
+zend_result zend_ini_prepare_string_for_scanning(const char *str, int scanner_mode)
 {
 	int len = (int)strlen(str);
 
@@ -303,7 +303,7 @@ zend_result zend_ini_prepare_string_for_scanning(char *str, int scanner_mode)
 /* }}} */
 
 /* {{{ zend_ini_escape_string() */
-static void zend_ini_escape_string(zval *lval, char *str, int len, char quote_type)
+static void zend_ini_escape_string(zval *lval, const char *str, int len, char quote_type)
 {
 	char *s, *t;
 	char *end;
@@ -493,7 +493,7 @@ SECTION_VALUE_CHARS ([^$\n\r;"'\]\\]|("\\"{ANY_CHAR})|{LITERAL_DOLLAR})
 }
 
 <ST_RAW>{RAW_VALUE_CHARS} { /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
-	unsigned char *sc = NULL;
+	const unsigned char *sc = NULL;
 	EAT_LEADING_WHITESPACE();
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR) {
@@ -591,7 +591,7 @@ end_raw_value_chars:
 		return 0;
 	}
 
-	unsigned char *s = SCNG(yy_text);
+	const unsigned char *s = SCNG(yy_text);
 
 	while (s < YYLIMIT) {
 		switch (*s++) {