diff options
| author | Xinchen Hui <laruence@php.net> | 2012-03-02 03:25:41 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-03-02 03:25:41 +0000 |
| commit | 5f99d789b55ba53a54870909e09332ac377ee557 (patch) | |
| tree | 550486851295886b12458866aad29bf948715d8a /Zend/zend_execute_API.c | |
| parent | 2e5e82a8ca687d47eb413c1d3c6836f47eb007fb (diff) | |
| download | php-git-5f99d789b55ba53a54870909e09332ac377ee557.tar.gz | |
MFH: Fixed bug #60978 (exit code incorrect)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index a60fff3bcb..10adfb6a26 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1195,7 +1195,13 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s } CG(interactive) = 0; - zend_execute(new_op_array TSRMLS_CC); + zend_try { + zend_execute(new_op_array TSRMLS_CC); + } zend_catch { + destroy_op_array(new_op_array TSRMLS_CC); + efree(new_op_array); + zend_bailout(); + } zend_end_try(); CG(interactive) = orig_interactive; if (local_retval_ptr) { |