From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 1 Sep 2005 19:14:54 +0000 (+0000)
Subject: Fixed bug #34331 (php crashes when variables_order is empty).
X-Git-Tag: PRE_NEW_OCI8_EXTENSION~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f1aa243c35411a4c667d2ca284720c784c963fa;p=php

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

diff --git a/main/php_variables.c b/main/php_variables.c
index 0e3858ac1e..3242c0724b 100644
--- 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);
 	}