diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-12-05 01:44:45 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-12-05 01:44:45 +0000 |
| commit | aa1b20614baf2d7cbfe5366c21c0efe40a49f0cc (patch) | |
| tree | f5cddb94f2b0cbee76523c6348a4d18da25f0aa2 /Zend/zend_default_classes.c | |
| parent | 036e8dea10793fcbd95d215c2e1bf4f743de679e (diff) | |
| download | php-git-aa1b20614baf2d7cbfe5366c21c0efe40a49f0cc.tar.gz | |
Fixed crash demonstrated with ext/dom/tests/dom003.phpt test case.
Diffstat (limited to 'Zend/zend_default_classes.c')
| -rw-r--r-- | Zend/zend_default_classes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c index 8fdb245cb3..2679f0a9b8 100644 --- a/Zend/zend_default_classes.c +++ b/Zend/zend_default_classes.c @@ -481,9 +481,9 @@ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC) 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)) { |