Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

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

PEAR_1_4DEV
Ilia Alshanetsky 23 years ago
parent
036e8dea10
commit
aa1b20614b
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Zend/zend_default_classes.c
  2. 6
      Zend/zend_exceptions.c

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

Write Preview
Loading…
Cancel
Save