]> granicus.if.org Git - php/commitdiff
Fixed bug #70538 ("php-fpm -i" crashes)
authorXinchen Hui <laruence@gmail.com>
Mon, 21 Sep 2015 02:55:38 +0000 (10:55 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 21 Sep 2015 02:55:38 +0000 (10:55 +0800)
sapi/fpm/fpm/fpm_main.c

index 7b02d33dff6cc6303b21a635d23608077b1424c3..18f8a908db9d28d773b688a5548cb3e8c93660b2 100644 (file)
@@ -601,7 +601,7 @@ static void sapi_cgi_register_variables(zval *track_vars_array) /* {{{ */
        if (CGIG(fix_pathinfo)) {
                char *script_name = SG(request_info).request_uri;
                unsigned int script_name_len = script_name ? strlen(script_name) : 0;
-               char *path_info = FCGI_GETENV(request, "PATH_INFO");
+               char *path_info = request? FCGI_GETENV(request, "PATH_INFO") : NULL;
                unsigned int path_info_len = path_info ? strlen(path_info) : 0;
 
                php_self_len = script_name_len + path_info_len;