cvs: php-src(PHP_5_0) / NEWS /ext/xml xml.c

helly Thu Mar 10 20:14:33 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/xml xml.c /php-src NEWS Log: - Bugfix #30266 http://cvs.php.net/diff.php/php-src/ext/xml/xml.c?r1=1.151.2.2&r2=1.151.2.3&ty=u Index: php-src/ext/xml/xml.c diff -u php-src/ext/xml/xml.c:1.151.2.2 php-src/ext/xml/xml.c:1.151.2.3 --- php-src/ext/xml/xml.c:1.151.2.2 Tue Feb 8 00:38:04 2005 +++ php-src/ext/xml/xml.c Thu Mar 10 20:14:29 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.151.2.2 2005/02/08 05:38:04 rasmus Exp $ */ +/* $Id: xml.c,v 1.151.2.3 2005/03/11 01:14:29 helly Exp $ */ #define IS_EXT_MODULE @@ -388,12 +388,12 @@ /* {{{ xml_call_handler() */ static zval *xml_call_handler(xml_parser *parser, zval *handler, zend_function *function_ptr, int argc, zval **argv) { + int i; TSRMLS_FETCH(); - if (parser && handler) { + if (parser && handler && !EG(exception)) { zval ***args; zval *retval; - int i; int result; zend_fcall_info fci; @@ -437,10 +437,14 @@ if (result == FAILURE) { return NULL; } else { - return retval; + return EG(exception) ? NULL : retval; } + } else { + for (i = 0; i < argc; i++) { + zval_ptr_dtor(&argv[i]); } return NULL; + } } /* }}} */ http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.282&r2=1.1760.2.283&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.282 php-src/NEWS:1.1760.2.283 --- php-src/NEWS:1.1760.2.282 Thu Mar 10 08:27:14 2005 +++ php-src/NEWS Thu Mar 10 20:14:29 2005 @@ -132,6 +132,7 @@ - Fixed bug #30446 (apache2handler: virtual() includes files out of sequence) - Fixed bug #30430 (odbc_next_result() doesn't bind values and that results in segfault). (pdan-php at esync dot org, Tony) +- Fixed bug #30266 (Invalid opcode 137/1/8). (Marcus) - Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many parameters). (Jani) - Fixed bug #29989 (type re_registers redefined in oniguruma.h). (Moriyoshi)