From: Derick Rethans <derick@php.net>
Date: Sun, 29 Jan 2012 15:25:40 +0000 (+0000)
Subject: - Reinstated correct return values after David's fix for #60218.
X-Git-Tag: php-5.4.0RC7~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33863b2cf8367e607da0b8d185ccc37d23a6abb9;p=php

- Reinstated correct return values after David's fix for #60218.
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 6f6ca01923..f9048dada3 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1195,8 +1195,11 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
 		}
 		CG(interactive) = 0;
 
+		retval = SUCCESS;
 		zend_try {
-		    zend_execute(new_op_array TSRMLS_CC);
+			zend_execute(new_op_array TSRMLS_CC);
+		} zend_catch {
+			retval = FAILURE;
 		} zend_end_try();
 
 		CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
 		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;
 	}