Fixed bug #34331 (php crashes when variables_order is empty).

diff --git a/main/php_variables.c b/main/php_variables.c
index 0e3858ac1e624305c839f8ee8ef75bdc832d5e03..3242c0724bd03f9c78bf1ecca23af297097a00a9 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -969,7 +969,7 @@ int php_hash_environment(TSRMLS_D)
 
 static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS_DC)
 {
-       if (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s')) {
+       if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) {
                php_register_server_variables(TSRMLS_C);
        } else {
                zval *server_vars=NULL;
@@ -1004,7 +1004,7 @@ static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC
        }
        PG(http_globals)[TRACK_VARS_ENV] = env_vars;
        
-       if (strchr(PG(variables_order),'E') || strchr(PG(variables_order),'e')) {
+       if (PG(variables_order) && (strchr(PG(variables_order),'E') || strchr(PG(variables_order),'e'))) {
                php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
        }