MFH: Fix expand_filepath when including relative files, ideally you should test your...

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 70b07ef8b2dbaab5d6413cac74ae6ebaae475c1f..e0122ff152958f561bad6273ccec08a8ee61ad67 100644 (file)
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -621,8 +621,10 @@ PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
                                copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath);
                                real_path = estrndup(filepath, copy_len);
                                return real_path;
+                       } else {
+                               cwd[0] = '\0';
                        }
-               } else {
+               } else if (!result) {
                        cwd[0] = '\0';
                }
        }