andi Fri Dec 10 17:59:25 2004 EDT
Modified files:
/php-src/main main.c
Log:
- Fix bug #27728 (Can't return within a zend_try{} or the previous
state isn't restored.
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.614&r2=1.615&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.614 php-src/main/main.c:1.615
--- php-src/main/main.c:1.614 Mon Oct 18 06:26:45 2004
+++ php-src/main/main.c Fri Dec 10 17:59:25 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.614 2004/10/18 10:26:45 hyanantha Exp $ */
+/* $Id: main.c,v 1.615 2004/12/10 22:59:25 andi Exp $ */
/* {{{ includes
*/
@@ -1740,6 +1740,7 @@
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 @@
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;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
