Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit e1934f851571 · 2019-08-02T10:35:48.000+02:00
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1312,7 +1312,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr)
 
 		if (LANG_SCNG(yy_text)[0] == 0 &&
 			LANG_SCNG(yy_leng) == 1 &&
-			memcmp(yystr, "\"end of file\"", sizeof("\"end of file\"") - 1) == 0) {
+			strcmp(yystr, "\"end of file\"") == 0) {
 			if (yyres) {
 				yystpcpy(yyres, "end of file");
 			}

Original file line number	Diff line number	Diff line change
`@@ -1312,7 +1312,7 @@ static YYSIZE_T zend_yytnamerr(char yyres, const char yystr)`
`1312`	`1312`
`1313`	`1313`	`if (LANG_SCNG(yy_text)[0] == 0 &&`
`1314`	`1314`	`LANG_SCNG(yy_leng) == 1 &&`
`1315`		`- memcmp(yystr, "\"end of file\"", sizeof("\"end of file\"") - 1) == 0) {`
	`1315`	`+ strcmp(yystr, "\"end of file\"") == 0) {`
`1316`	`1316`	`if (yyres) {`
`1317`	`1317`	`yystpcpy(yyres, "end of file");`
`1318`	`1318`	`}`