Commit: 02e3718ef907c3d6063ea746e5a1fd1047ded7bc Author: krakjoe <joe.watk...@live.co.uk> Sun, 17 Nov 2013 16:06:30 +0000 Parents: a0151e91a5b315ceb607c84518fad94eecef866d Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=02e3718ef907c3d6063ea746e5a1fd1047ded7bc Log: fix segfault when autoglobals are not properly setup Changed paths: M phpdbg_prompt.c M test.php Diff: diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index f4f4a03..24f69d7 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -350,7 +350,12 @@ static PHPDBG_COMMAND(run) /* {{{ */ if (!EG(active_symbol_table)) { zend_rebuild_symbol_table(TSRMLS_C); } - + + zend_try { + /* last chance ... */ + zend_activate_auto_globals(TSRMLS_C); + } zend_end_try(); + zend_try { zend_execute( EG(active_op_array) TSRMLS_CC); diff --git a/test.php b/test.php index 02c58b5..d11310b 100644 --- a/test.php +++ b/test.php @@ -1,5 +1,6 @@ <?php -include 'web-bootstrap.php'; +if (isset($include)) + include (sprintf("%s/web-bootstrap.php", dirname(__FILE__))); class phpdbg { public function isGreat($greeting = null) { @@ -32,4 +33,6 @@ test(); echo "it works!\n"; +if (isset($dump)) + var_dump($_SERVER); ?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
