Skip to content

Commit 33863b2

Browse files
author
Derick Rethans
committed
- Reinstated correct return values after David's fix for #60218.
1 parent 9111a8a commit 33863b2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Zend/zend_execute_API.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,8 +1195,11 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
11951195
}
11961196
CG(interactive) = 0;
11971197

1198+
retval = SUCCESS;
11981199
zend_try {
1199-
zend_execute(new_op_array TSRMLS_CC);
1200+
zend_execute(new_op_array TSRMLS_CC);
1201+
} zend_catch {
1202+
retval = FAILURE;
12001203
} zend_end_try();
12011204

12021205
CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
12181221
destroy_op_array(new_op_array TSRMLS_CC);
12191222
efree(new_op_array);
12201223
EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
1221-
retval = SUCCESS;
12221224
} else {
12231225
retval = FAILURE;
12241226
}

0 commit comments

Comments
 (0)