summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorJani Taskinen <jani@php.net>2009-11-25 12:35:42 (GMT)
committerJani Taskinen <jani@php.net>2009-11-25 12:35:42 (GMT)
commitbf7ed5eff5a39724b59beffaa3af2fc08117f490 (patch)
treece771eefcdcd808eb60e71b86e11cbb509403ce1 /sapi
parentafc44b981eed01c75ae36504bc15fdba171fd355 (diff)
downloadphp-bf7ed5eff5a39724b59beffaa3af2fc08117f490.tar.gz
- Fixed bug #49677 (ini parser crashes with apache2 and using ${something} ini variables)
Diffstat (limited to 'sapi')
-rw-r--r--sapi/apache2handler/sapi_apache2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index c77e564..ecf1802 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;