summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorAndi Gutmans <andi@php.net>2004-12-10 22:59:25 (GMT)
committerAndi Gutmans <andi@php.net>2004-12-10 22:59:25 (GMT)
commit4e942cb07fef69e27815d54873acc1b6e126e0c4 (patch)
tree11dc0bd116a8c0982496c0e359562a60ba872435 /main
parent01b996b98bc565be9b534beedcfe1a40a095e6da (diff)
downloadphp-4e942cb07fef69e27815d54873acc1b6e126e0c4.tar.gz
- Fix bug #27728 (Can't return within a zend_try{} or the previous
state isn't restored.
Diffstat (limited to 'main')
-rw-r--r--main/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c
index 884d56a..81952f1 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1740,6 +1740,7 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC)
PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
{
zend_op_array *op_array;
+ zend_bool retval = FAILURE;
zend_try {
op_array = zend_compile_file(file, ZEND_INCLUDE TSRMLS_CC);
@@ -1748,13 +1749,11 @@ PHPAPI int php_lint_script(zend_file_handle *file TSRMLS_DC)
if (op_array) {
destroy_op_array(op_array TSRMLS_CC);
efree(op_array);
- return SUCCESS;
- } else {
- return FAILURE;
+ retval = SUCCESS;
}
} zend_end_try();
- return FAILURE;
+ return retval;
}
/* }}} */