com php-src: Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).: NEWS Zend/zend_la nguage_parser.y
| From: | Xinchen Hui | Date: | Tue, 26 Jun 2012 10:42:33 +0000 |
| Subject: | com php-src: Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).: NEWS Zend/zend_la nguage_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69468@lists.php.net to get a copy of this message | ||
Commit: a44a1dc194e60c51a4b7716f78f34a7dc334744b
Author: Xinchen Hui <laruence@php.net> Tue, 26 Jun 2012 18:42:33 +0800
Parents: 91e1df704eed40325fd963a308e466bbbf96184f
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a44a1dc194e60c51a4b7716f78f34a7dc334744b
Log:
Fixed bug #62357 (compile failure: (S) Arguments missing for built-in function __memcmp).
Any C library function may be a macro, We should avoid using ZEND_STRS(L) as their arguments
Bugs:
https://bugs.php.net/62357
Changed paths:
M NEWS
M Zend/zend_language_parser.y
Diff:
diff --git a/NEWS b/NEWS
index e93d717..f8a98c7 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP NEWS
?? ??? 2012, PHP 5.4.5
- Core:
+ . Fixed bug #62357 (compile failure: (S) Arguments missing for built-in
+ function __memcmp).. (Laruence)
. Fixed bug #61998 (Using traits with method aliases appears to result in
crash during execution). (Dmitry)
. Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index d0730b7..9a0b320 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1191,7 +1191,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, ZEND_STRL("\"end of file\"")) == 0) {
+ memcmp(yystr, "\"end of file\"", sizeof("\"end of
file\"") - 1) == 0) {
yystpcpy(yyres, "end of file");
return sizeof("end of file")-1;
}