dmitry Tue Jan 29 20:01:43 2008 UTC
Modified files:
/php-src/sapi/cli php_cli.c
Log:
Fixed bug #43968 (Extending internal class causes a crash)
The fix is a workaround for GCC optizer bug.
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.183&r2=1.184&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.183 php-src/sapi/cli/php_cli.c:1.184
--- php-src/sapi/cli/php_cli.c:1.183 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/cli/php_cli.c Tue Jan 29 20:01:43 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.183 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php_cli.c,v 1.184 2008/01/29 20:01:43 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -590,7 +590,7 @@
int main(int argc, char *argv[])
#endif
{
- int exit_status = SUCCESS;
+ volatile int exit_status = SUCCESS;
int c;
zend_file_handle file_handle;
/* temporary locals */
@@ -601,8 +601,8 @@
char *arg_free=NULL, **arg_excp=&arg_free;
char *script_file=NULL;
int interactive=0;
- int module_started = 0;
- int request_started = 0;
+ volatile int module_started = 0;
+ volatile int request_started = 0;
int lineno = 0;
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL,
*exec_end=NULL;
const char *param_error=NULL;
@@ -1232,8 +1232,9 @@
if (exec_end && zend_eval_string_ex(exec_end,
NULL, "Command line end code", 1 TSRMLS_CC) == FAILURE) {
exit_status=254;
}
-
+
break;
+ }
#ifdef HAVE_REFLECTION
case PHP_MODE_REFLECTION_FUNCTION:
case PHP_MODE_REFLECTION_CLASS:
@@ -1314,7 +1315,6 @@
zend_printf("Additional .ini files
parsed: %s\n", php_ini_scanned_files ? php_ini_scanned_files : "(none)");
break;
}
- }
}
} zend_end_try();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
