]> granicus.if.org Git - php/commitdiff
Fix crash on broken setups (#5979)
authorStanislav Malyshev <stas@php.net>
Sat, 5 Aug 2000 11:28:32 +0000 (11:28 +0000)
committerStanislav Malyshev <stas@php.net>
Sat, 5 Aug 2000 11:28:32 +0000 (11:28 +0000)
sapi/cgi/cgi_main.c

index 10d5d39059e7bd33681c51bcacfd95a4258bcc1b..a985ebee22560ab1d6122a458d103ad8fa7eb2d1 100644 (file)
@@ -669,11 +669,15 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
           or user_dir configuration directives, PATH_INFO is used to construct
           the filename as a side effect of php_fopen_primary_script.
         */
+               char *env_path_translated=NULL;
 #if DISCARD_PATH
-               SG(request_info).path_translated = estrdup(getenv("SCRIPT_FILENAME"));
+               env_path_translated = getenv("SCRIPT_FILENAME");
 #else
-               SG(request_info).path_translated = estrdup(getenv("PATH_TRANSLATED"));
+               env_path_translated = getenv("PATH_TRANSLATED");
 #endif
+               if(env_path_translated) {
+                       SG(request_info).path_translated = estrdup(env_path_translated);
+               }
        }
        if (cgi || SG(request_info).path_translated) {
                file_handle.handle.fp = php_fopen_primary_script();