From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 17 Nov 2013 16:06:30 +0000 (+0000)
Subject: fix segfault when autoglobals are not properly setup
X-Git-Tag: php-5.6.0alpha1~110^2~265^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02e3718ef907c3d6063ea746e5a1fd1047ded7bc;p=php

fix segfault when autoglobals are not properly setup
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index f4f4a03581..24f69d7a61 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 02c58b50da..d11310bb9a 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);
 ?>