cvs: ZendEngine2(PHP_5_3) / zend_language_parser.y
[email protected] ("Antony Dovgal")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvstony20011226055086@cvsserver> |
tony2001 Fri Nov 7 10:51:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_language_parser.y
Log:
fix typo causing invalid reads
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_parser.y?r1=1.160.2.4.2.8.2.27&r2=1.160.2.4.2.8.2.28&diff_format=u
Index: ZendEngine2/zend_language_parser.y
diff -u ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.27 ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.28
--- ZendEngine2/zend_language_parser.y:1.160.2.4.2.8.2.27 Tue Nov 4 15:58:50 2008
+++ ZendEngine2/zend_language_parser.y Fri Nov 7 10:51:26 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.27 2008/11/04 15:58:50 helly Exp $ */
+/* $Id: zend_language_parser.y,v 1.160.2.4.2.8.2.28 2008/11/07 10:51:26 tony2001 Exp $ */
/*
* LALR shift/reduce conflicts and how they are resolved:
@@ -696,7 +696,7 @@
T_STATIC { $$.op_type = IS_CONST; ZVAL_STRINGL(&$$.u.constant, "static", sizeof("static")-1, 1);}
| namespace_name { $$ = $1; }
| T_NAMESPACE T_NS_SEPARATOR namespace_name { $$.op_type = IS_CONST; ZVAL_EMPTY_STRING(&$$.u.constant); zend_do_build_namespace_name(&$$, &$$, &$3 TSRMLS_CC); }
- | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+2); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); $$ = $2; }
+ | T_NS_SEPARATOR namespace_name { char *tmp = estrndup(Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); memcpy(&(tmp[1]), Z_STRVAL($2.u.constant), Z_STRLEN($2.u.constant)+1); tmp[0] = '\\'; efree(Z_STRVAL($2.u.constant)); Z_STRVAL($2.u.constant) = tmp; ++Z_STRLEN($2.u.constant); $$ = $2; }
;
fully_qualified_class_name: