Merge branch 'PHP-7.4' into PHP-8.0

nikic · nikic · commit f6bd3dfdbcc0 · 2020-12-16T10:20:43.000+01:00
* PHP-7.4:
  Fix bug #80523
diff --git a/NEWS b/NEWS
@@ -2,6 +2,8 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.0.2RC1
 
+- Core:
+  . Fixed bug #80523 (bogus parse error on >4GB source code). (Nikita)
 
 07 Jan 2021, PHP 8.0.1
 
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
@@ -177,7 +177,7 @@ 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(char *str, size_t len)
 {
 	YYCURSOR       = (YYCTYPE*)str;
 	YYLIMIT        = YYCURSOR + len;
@@ -571,7 +571,7 @@ ZEND_API zend_result open_file_for_scanning(zend_file_handle *file_handle)
 			}
 		}
 		SCNG(yy_start) = (unsigned char *)buf;
-		yy_scan_buffer(buf, (unsigned int)size);
+		yy_scan_buffer(buf, size);
 	} else {
 		zend_error_noreturn(E_COMPILE_ERROR, "zend_stream_mmap() failed");
 	}
@@ -772,7 +772,7 @@ ZEND_API void zend_prepare_string_for_scanning(zval *str, const char *filename)
 		}
 	}
 
-	yy_scan_buffer(buf, (unsigned int)size);
+	yy_scan_buffer(buf, size);
 
 	new_compiled_filename = zend_string_init(filename, strlen(filename), 0);
 	zend_set_compiled_filename(new_compiled_filename);

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ static void yy_pop_state(void)`
`177`	`177`	`zend_stack_del_top(&SCNG(state_stack));`
`178`	`178`	`}`
`179`	`179`
`180`		`-static void yy_scan_buffer(char *str, unsigned int len)`
	`180`	`+static void yy_scan_buffer(char *str, size_t len)`
`181`	`181`	`{`
`182`	`182`	`YYCURSOR = (YYCTYPE*)str;`
`183`	`183`	`YYLIMIT = YYCURSOR + len;`
`@@ -571,7 +571,7 @@ ZEND_API zend_result open_file_for_scanning(zend_file_handle *file_handle)`
`571`	`571`	`}`
`572`	`572`	`}`
`573`	`573`	`SCNG(yy_start) = (unsigned char *)buf;`
`574`		`- yy_scan_buffer(buf, (unsigned int)size);`
	`574`	`+ yy_scan_buffer(buf, size);`
`575`	`575`	`} else {`
`576`	`576`	`zend_error_noreturn(E_COMPILE_ERROR, "zend_stream_mmap() failed");`
`577`	`577`	`}`
`@@ -772,7 +772,7 @@ ZEND_API void zend_prepare_string_for_scanning(zval str, const char filename)`
`772`	`772`	`}`
`773`	`773`	`}`
`774`	`774`
`775`		`- yy_scan_buffer(buf, (unsigned int)size);`
	`775`	`+ yy_scan_buffer(buf, size);`
`776`	`776`
`777`	`777`	`new_compiled_filename = zend_string_init(filename, strlen(filename), 0);`
`778`	`778`	`zend_set_compiled_filename(new_compiled_filename);`