From: Jani Taskinen <jani@php.net>
Date: Wed, 25 Nov 2009 12:35:42 +0000 (+0000)
Subject: - Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables)
X-Git-Tag: php-5.3.2RC1~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf7ed5eff5a39724b59beffaa3af2fc08117f490;p=php

- Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables)
---

diff --git a/NEWS b/NEWS
index 0c2279d5eb..e20f00f490 100644
--- a/NEWS
+++ b/NEWS
@@ -77,6 +77,8 @@ PHP                                                                        NEWS
   (Ilia, wmeler at wp-sa dot pl)
 - Fixed bug #49719 (ReflectionClass::hasProperty returns true for a private
   property in base class). (Felipe)
+- Fixed bug #49677 (ini parser crashes with apache2 and using ${something}
+  ini variables). (Jani)
 - Fixed bug #49647 (DOMUserData does not exist). (Rob)
 - Fixed bug #49521 (PDO fetchObject sets values before calling constructor).
   (Pierrick)
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index c77e5647e1..ecf1802c0a 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -239,6 +239,10 @@ php_apache_sapi_getenv(char *name, size_t name_len TSRMLS_DC)
 	php_struct *ctx = SG(server_context);
 	const char *env_var;
 
+	if (ctx == NULL) {
+		return NULL;
+	}
+
 	env_var = apr_table_get(ctx->r->subprocess_env, name);
 
 	return (char *) env_var;