Patch wrong_exit_code.patch for Scripting Engine problem Bug #60978

Patch version 2012-02-06 09:55 UTC

• 2012-02-06 09:55 UTC [diff to current]

Developer: laruence@php.net

Index: Zend/zend_execute_API.c
===================================================================
--- Zend/zend_execute_API.c	(revision 323082)
+++ Zend/zend_execute_API.c	(working copy)
@@ -1195,11 +1195,12 @@
 		}
 		CG(interactive) = 0;
 
-		retval = SUCCESS;
 		zend_try {
 			zend_execute(new_op_array TSRMLS_CC);
 		} zend_catch {
-			retval = FAILURE;
+			destroy_op_array(new_op_array TSRMLS_CC);
+			efree(new_op_array);
+			zend_bailout();
 		} zend_end_try();
 
 		CG(interactive) = orig_interactive;
@@ -1221,6 +1222,7 @@
 		destroy_op_array(new_op_array TSRMLS_CC);
 		efree(new_op_array);
 		EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
+		retval = SUCCESS;
 	} else {
 		retval = FAILURE;
 	}