]> granicus.if.org Git - php/commitdiff
merge the fix for #51688
authorAntony Dovgal <tony2001@php.net>
Fri, 30 Apr 2010 08:20:57 +0000 (08:20 +0000)
committerAntony Dovgal <tony2001@php.net>
Fri, 30 Apr 2010 08:20:57 +0000 (08:20 +0000)
sapi/fpm/fpm/fpm_main.c

index 512d50abc810d81b677465e9de96cf462d367987..f02f93b0e6ea8a7b58f28f7c5774ba0267523bc7 100644 (file)
@@ -753,6 +753,9 @@ static void php_cgi_ini_activate_user_config(char *path, int path_len, const cha
 
                if (!IS_ABSOLUTE_PATH(path, path_len)) {
                        real_path = tsrm_realpath(path, NULL TSRMLS_CC);
+                       if (real_path == NULL) {
+                               return;
+                       }
                        real_path_len = strlen(real_path);
                        path = real_path;
                        path_len = real_path_len;