cvs: ZendEngine2(PHP_5_0) / zend_execute.c
| From: | Dmitry Stogov | Date: | Thu, 13 Jan 2005 08:48:53 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_0) / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3287@lists.php.net to get a copy of this message | ||
dmitry Thu Jan 13 03:48:53 2005 EDT
Modified files: (Branch: PHP_5_0)
/ZendEngine2 zend_execute.c
Log:
Additional fix for fix of bug #29883
http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.652.2.14&r2=1.652.2.15&ty=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.652.2.14 ZendEngine2/zend_execute.c:1.652.2.15
--- ZendEngine2/zend_execute.c:1.652.2.14 Wed Jan 12 04:17:42 2005
+++ ZendEngine2/zend_execute.c Thu Jan 13 03:48:50 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.652.2.14 2005/01/12 09:17:42 dmitry Exp $ */
+/* $Id: zend_execute.c,v 1.652.2.15 2005/01/13 08:48:50 dmitry Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -976,7 +976,7 @@
ZVAL_LONG(&tmp, lval);
offset = &tmp;
} else {
- if (type != BP_VAR_IS && type != BP_VAR_UNSET) {
+ if (type != BP_VAR_IS) {
zend_error(E_NOTICE, "Trying to get string index from a string");
}
*retval = &EG(error_zval_ptr);;