- Fix bug when using safe_mode and doc_root together

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index eec07555efe66cfdc6dcad8e8393fa68b7f06e2a..21674d57eb6e773e3bcfa3dda0f531a56c066243 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -413,16 +413,12 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
 #else
        if (IS_SLASH(*filename)) {
 #endif
-               if (PG(safe_mode)) {
-                       if(PG(doc_root)) {
-                               snprintf(trypath, MAXPATHLEN, "%s%s", PG(doc_root), filename);
-                       } else {
-                               strlcpy(trypath,filename,sizeof(trypath));
-                       }
+               if (PG(safe_mode)&& PG(doc_root)) {
+                       snprintf(trypath, MAXPATHLEN, "%s%s", PG(doc_root), filename);
                        if (!php_checkuid(trypath, mode, 0)) {
                                return NULL;
                        }
-                       return php_fopen_and_set_opened_path(filename, mode, opened_path);
+                       return php_fopen_and_set_opened_path(trypath, mode, opened_path);
                } else {
                        return php_fopen_and_set_opened_path(filename, mode, opened_path);
                }