archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed crash demonstrated with ext/dom/tests/dom003.phpt test case.

Browse source
This commit is contained in:
Ilia Alshanetsky 2003-12-05 01:44:45 +00:00
parent 036e8dea10
commit aa1b20614b
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_default_classes.c
View file

@ -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)) {

6
Zend/zend_exceptions.c
View file

@ -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)) {