cvs: ZendEngine2(PHP_5_0) / zend_execute_API.c php-src NEWS
| From: | Dmitry Stogov | Date: | Wed, 02 Nov 2005 09:15:09 +0000 |
| Subject: | cvs: ZendEngine2(PHP_5_0) / zend_execute_API.c php-src NEWS | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-4317@lists.php.net to get a copy of this message | ||
dmitry Wed Nov 2 04:15:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/ZendEngine2 zend_execute_API.c
Log:
Fixed bug #34978 (php out of memory or segmentation fault while installing sugarcrm 3.5.1a)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.508&r2=1.1760.2.509&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.508 php-src/NEWS:1.1760.2.509
--- php-src/NEWS:1.1760.2.508 Fri Oct 28 05:57:12 2005
+++ php-src/NEWS Wed Nov 2 04:15:04 2005
@@ -8,6 +8,8 @@
zero). (Tony)
- Fixed bug #34982 (array_walk_recursive() modifies elements outside function
scope). (Dmitry)
+- Fixed bug #34978 (php out of memory or segmentation fault while installing
+ sugarcrm 3.5.1a). (Dmitry)
- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony)
- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
http://cvs.php.net/diff.php/ZendEngine2/zend_execute_API.c?r1=1.287.2.25&r2=1.287.2.26&ty=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.287.2.25 ZendEngine2/zend_execute_API.c:1.287.2.26
--- ZendEngine2/zend_execute_API.c:1.287.2.25 Fri Sep 2 03:46:39 2005
+++ ZendEngine2/zend_execute_API.c Wed Nov 2 04:15:07 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.287.2.25 2005/09/02 07:46:39 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.287.2.26 2005/11/02 09:15:07 dmitry Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -397,6 +397,13 @@
zval_dtor(zv);
safe_free_zval_ptr_rel(zv ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC);
} else if (zv->refcount == 1) {
+ if ((*zval_ptr)->type == IS_OBJECT) {
+ TSRMLS_FETCH();
+
+ if (EG(ze1_compatibility_mode)) {
+ return;
+ }
+ }
zv->is_ref = 0;
}
}