Dmitry Stogov wrote:
dmitry Fri Jul 21 08:39:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2 zend_API.c zend_exceptions.c zend_vm_def.h
zend_vm_execute.h
Log:
Fixed wrong "type" argument to read_property() handler
------------------------------------------------------------------------
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.19&r2=1.296.2.27.2.20&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.19
ZendEngine2/zend_API.c:1.296.2.27.2.20
--- ZendEngine2/zend_API.c:1.296.2.27.2.19 Tue Jun 20 13:28:11 2006
+++ ZendEngine2/zend_API.c Fri Jul 21 08:39:30 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.19 2006/06/20 13:28:11 tony2001 Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.20 2006/07/21 08:39:30 dmitry Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -2901,7 +2901,7 @@
MAKE_STD_ZVAL(property);
ZVAL_STRINGL(property, name, name_length, 1);
- value = Z_OBJ_HT_P(object)->read_property(object, property, silent
TSRMLS_CC);
+ value = Z_OBJ_HT_P(object)->read_property(object, property,
silent?BP_VAR_IS:BP_VAR_R TSRMLS_CC);
zval_ptr_dtor(&property);
EG(scope) = old_scope;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_exceptions.c?r1=1.79.2.6.2.4&r2=1.79.2.6.2.5&diff_format=u
Index: ZendEngine2/zend_exceptions.c
diff -u ZendEngine2/zend_exceptions.c:1.79.2.6.2.4
ZendEngine2/zend_exceptions.c:1.79.2.6.2.5
--- ZendEngine2/zend_exceptions.c:1.79.2.6.2.4 Mon Jul 10 00:36:28 2006
+++ ZendEngine2/zend_exceptions.c Fri Jul 21 08:39:30 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_exceptions.c,v 1.79.2.6.2.4 2006/07/10 00:36:28 helly Exp $ */
+/* $Id: zend_exceptions.c,v 1.79.2.6.2.5 2006/07/21 08:39:30 dmitry Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -435,7 +435,7 @@
char *res = estrdup(""), **str = &res, *s_tmp;
int res_len = 0, *len = &res_len, num = 0;
- trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, BP_VAR_R TSRMLS_CC);
+ trace = zend_read_property(default_exception_ce, getThis(), "trace",
sizeof("trace")-1, 1 TSRMLS_CC);
Hi Dmitry,
was this change to a literal "1" intended?
--
Michael
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
