From 5f8809907a612e7eaf8fe4e638b5f61576e1de16 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 1 Sep 2005 19:15:19 +0000 Subject: [PATCH] MFH: Fixed bug #34331 (php crashes when variables_order is empty). --- NEWS | 1 + main/php_variables.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f261455e0f..0230796c50 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ PHP NEWS - Fixed "make test" to work for phpized extensions. (Hartmut, Jani) - Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems. (Andrey) +- Fixed bug #34331 (php crashes when variables_order is empty). (Ilia) - Fixed bug #34310 (foreach($arr as $c->d => $x) crashes). (Dmitry) - Fixed bug #34307 (OnUpdateStringUnempty INI options can be set empty). (Jani) - Fixed bug #34306 (wddx_serialize_value() crashes with long array keys). (Jani) diff --git a/main/php_variables.c b/main/php_variables.c index 507f0526ba..4479d6cc77 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -727,7 +727,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; @@ -762,7 +762,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); } -- 2.40.0