- Bugfix #30266

php · Mar 11, 2005 · 3d7b5b7 · 3d7b5b7
1 parent ad6e24c
commit 3d7b5b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -132,6 +132,7 @@ PHP                                                                        NEWS
 - 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)

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
@@ -388,12 +388,12 @@ static void xml_set_handler(zval **handler, zval **data)
 /* {{{ 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 @@ static zval *xml_call_handler(xml_parser *parser, zval *handler, zend_function *
 		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;
+	}
 }
 /* }}} */