cvs: Zend(PHP_4_3) / zend_execute.c
| From: | Stanislav Malyshev | Date: | Tue, 21 Dec 2004 10:37:50 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3237@lists.php.net to get a copy of this message | ||
stas Tue Dec 21 05:37:50 2004 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute.c
Log:
fix the overloading fix and #31106
http://cvs.php.net/diff.php/Zend/zend_execute.c?r1=1.316.2.42&r2=1.316.2.43&ty=u
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.316.2.42 Zend/zend_execute.c:1.316.2.43
--- Zend/zend_execute.c:1.316.2.42 Wed Nov 3 06:23:59 2004
+++ Zend/zend_execute.c Tue Dec 21 05:37:49 2004
@@ -1577,6 +1577,10 @@
EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list = (zend_llist *)
emalloc(sizeof(zend_llist));
zend_llist_init(EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list,
sizeof(zend_overloaded_element), NULL, 0);
EX(object).ptr->refcount++;
+ /* is-ref needed so that assign to this in call won't separate it */
+ if(EX(object).ptr->refcount > 1) {
+ EX(object).ptr->is_ref = 1;
+ }
}
zend_llist_add_element(EX(Ts)[EX(opline)->op1.u.var].EA.data.overloaded_element.elements_list,
&overloaded_element);
EX(fbc) = (zend_function *) emalloc(sizeof(zend_function));