cvs: ZendEngine2 / zend_default_classes.c
| From: | Ilia Alshanetsky | Date: | Fri, 05 Dec 2003 01:44:45 +0000 |
| Subject: | cvs: ZendEngine2 / zend_default_classes.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2078@lists.php.net to get a copy of this message | ||
iliaa Thu Dec 4 20:44:45 2003 EDT
Modified files:
/ZendEngine2 zend_default_classes.c
Log:
Fixed crash demonstrated with ext/dom/tests/dom003.phpt test case.
Index: ZendEngine2/zend_default_classes.c
diff -u ZendEngine2/zend_default_classes.c:1.48 ZendEngine2/zend_default_classes.c:1.49
--- ZendEngine2/zend_default_classes.c:1.48 Sun Nov 30 08:53:19 2003
+++ ZendEngine2/zend_default_classes.c Thu Dec 4 20:44:45 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_default_classes.c,v 1.48 2003/11/30 13:53:19 helly Exp $ */
+/* $Id: zend_default_classes.c,v 1.49 2003/12/05 01:44:45 iliaa Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -481,9 +481,9 @@
EG(exception) = NULL;
MAKE_STD_ZVAL(str);
- handler->cast_object(exception, str, IS_STRING, 0 TSRMLS_CC);
-
- zend_update_property_string(default_exception_ptr, exception, "string",
sizeof("string")-1, EG(exception) ? Z_OBJCE_P(exception)->name : Z_STRVAL_P(str)
TSRMLS_CC);
+ if (handler->cast_object(exception, str, IS_STRING, 0 TSRMLS_CC) != FAILURE) {
+ zend_update_property_string(default_exception_ptr, exception, "string",
sizeof("string")-1, EG(exception) ? Z_OBJCE_P(exception)->name : Z_STRVAL_P(str)
TSRMLS_CC);
+ }
zval_ptr_dtor(&str);
if (EG(exception)) {