Commit:    8ccf0655776c512f1e1c341e115e07d0e8ba6091
Author:    Xinchen Hui <larue...@php.net>         Fri, 6 Apr 2012 21:42:40 +0800
Committer: Johannes Schl├╝ter <johan...@php.net>      Thu, 12 Apr 2012 11:04:39 
+0200
Parents:   a4e6394a06fb11f80426e94874d0702cf5235726
Branches:  PHP-5.3.11

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=8ccf0655776c512f1e1c341e115e07d0e8ba6091

Log:
Fixed bug #61650 (ini parser crashes when using ${xxxx} ini variables (without 
apache2))

Bugs:
https://bugs.php.net/61650

Changed paths:
  M  main/SAPI.c


Diff:
diff --git a/main/SAPI.c b/main/SAPI.c
index 693cad3..271fd21 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -945,7 +945,9 @@ SAPI_API char *sapi_getenv(char *name, size_t name_len 
TSRMLS_DC)
                } else {
                        return NULL;
                }
-               sapi_module.input_filter(PARSE_ENV, name, &value, 
strlen(value), NULL TSRMLS_CC);
+               if (sapi_module.input_filter) {
+                       sapi_module.input_filter(PARSE_ENV, name, &value, 
strlen(value), NULL TSRMLS_CC);
+               }
                return value;
        }
        return NULL;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to