cvs: ZendEngine2(PHP_5_2) / zend_API.c /tests bug42119.phpt php-src NEWS
| From: | Dmitry Stogov | Date: | Wed, 01 Aug 2007 10:56:45 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_2) / zend_API.c /tests bug42119.phpt php-src NEWS | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-5938@lists.php.net to get a copy of this message | ||
dmitry Wed Aug 1 10:56:45 2007 UTC
Added files: (Branch: PHP_5_2)
/ZendEngine2/tests bug42119.phpt
Modified files:
/php-src NEWS
/ZendEngine2 zend_API.c
Log:
Fixed bug #42119 (array_push($arr,&$obj) doesn't work with zend.ze1_compatibility_mode
On)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.870&r2=1.2027.2.547.2.871&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.870 php-src/NEWS:1.2027.2.547.2.871
--- php-src/NEWS:1.2027.2.547.2.870 Wed Aug 1 10:39:32 2007
+++ php-src/NEWS Wed Aug 1 10:56:45 2007
@@ -78,6 +78,8 @@
(Ilia)
- Fixed bug #42134 (oci_error() returns false after oci_new_collection()
fails). (Tony)
+- Fixed bug #42119 (array_push($arr,&$obj) doesn't work with
+ zend.ze1_compatibility_mode On). (Dmitry)
- Fixed Bug #42112 (deleting a node produces memory corruption). (Rob)
- Fixed Bug #42107 (sscanf broken when using %2$s format parameters). (Jani)
- Fixed bug #42090 (json_decode causes segmentation fault). (Hannes)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_API.c?r1=1.296.2.27.2.32&r2=1.296.2.27.2.33&diff_format=u
Index: ZendEngine2/zend_API.c
diff -u ZendEngine2/zend_API.c:1.296.2.27.2.32 ZendEngine2/zend_API.c:1.296.2.27.2.33
--- ZendEngine2/zend_API.c:1.296.2.27.2.32 Fri Jul 6 12:17:58 2007
+++ ZendEngine2/zend_API.c Wed Aug 1 10:56:45 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_API.c,v 1.296.2.27.2.32 2007/07/06 12:17:58 tony2001 Exp $ */
+/* $Id: zend_API.c,v 1.296.2.27.2.33 2007/08/01 10:56:45 dmitry Exp $ */
#include "zend.h"
#include "zend_execute.h"
@@ -154,7 +154,9 @@
while (param_count-->0) {
zval **value = (zval**)(p-arg_count);
- if (EG(ze1_compatibility_mode) && Z_TYPE_PP(value) == IS_OBJECT) {
+ if (EG(ze1_compatibility_mode) &&
+ Z_TYPE_PP(value) == IS_OBJECT &&
+ !(*value)->is_ref) {
zval *value_ptr;
char *class_name;
zend_uint class_name_len;
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug42119.phpt?view=markup&rev=1.1
Index: ZendEngine2/tests/bug42119.phpt
+++ ZendEngine2/tests/bug42119.phpt