From 2a3e37a496216488e273cdc46b46c454b0017baa Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 13 Jan 2020 11:23:30 +0100 Subject: [PATCH] Don't use yystrlen() This is unnecessary and not available when GLR is used. --- Zend/zend_language_parser.y | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 57e88e630d..f501527740 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -1355,7 +1355,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr) str = LANG_SCNG(yy_text); end = memchr(str, '\n', LANG_SCNG(yy_leng)); - yystr_len = (unsigned int)yystrlen(yystr); + yystr_len = (unsigned int)strlen(yystr); if ((tok1 = memchr(yystr, '(', yystr_len)) != NULL && (tok2 = zend_memrchr(yystr, ')', yystr_len)) != NULL) { @@ -1383,7 +1383,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr) /* One of the expected tokens */ if (!yyres) { - return yystrlen(yystr) - (*yystr == '"' ? 2 : 0); + return strlen(yystr) - (*yystr == '"' ? 2 : 0); } if (*yystr == '"') { -- 2.40.0