mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fixed crash demonstrated with ext/dom/tests/dom003.phpt test case.
This commit is contained in:
parent
036e8dea10
commit
aa1b20614b
@ -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)) {
|
||||
|
@ -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)) {
|
||||
|
Loading…
Reference in New Issue
Block a user