Fixed bug #38989 (Absolute path with slash at beginning doesn't work on win)

diff --git a/NEWS b/NEWS
index bb0e30b0a60833bb1953a5cf5d8b192085c8c2a7..63b560d75987214fad6592a2aa83e30943cb660e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@ PHP                                                                        NEWS
 - Fixed bug #38996 (PDO_MYSQL doesn't check connections for liveness). (Tony)
 - Fixed bug #38993 (Fixed safe_mode/open_basedir checks for
   session.save_path, allowing them to account for extra parameters). (Ilia)
+- Fixed bug #38989 (Absolute path with slash at beginning doesn't work on win).
+  (Dmitry)
 - Fixed bug #38981 (using FTP URLs in get_headers() causes crash). (Tony)
 - Fixed bug #38961 (metaphone() results in segmentation fault on NetBSD). 
   (Tony)

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index 422c993586bb57b3557fc8368808aa3c1076e813..54ae9a75ffc2ba74bb5b05e4bc27758e0503f4f6 100644 (file)
--- a/TSRM/tsrm_virtual_cwd.c
+++ b/TSRM/tsrm_virtual_cwd.c
@@ -386,14 +386,21 @@ CWD_API int virtual_file_ex(cwd_state *state, const char *path, verify_path_func
         * This can happen under solaris when a dir does not have read permissions
         * but *does* have execute permissions */
        if (!IS_ABSOLUTE_PATH(path, path_length) && (state->cwd_length > 1)) {
-               int orig_path_len = path_length + state->cwd_length + 1;
+               int orig_path_len;
+               int state_cwd_length = state->cwd_length;
 
+#ifdef TSRM_WIN32
+               if (IS_SLASH(path[0])) {
+                       state_cwd_length = 2;
+               }
+#endif
+               orig_path_len = path_length + state_cwd_length + 1;
                if (orig_path_len >= MAXPATHLEN) {
                        return 1;
                }
-               memcpy(orig_path, state->cwd, state->cwd_length);
-               orig_path[state->cwd_length] = DEFAULT_SLASH;
-               memcpy(orig_path + state->cwd_length + 1, path, path_length + 1);
+               memcpy(orig_path, state->cwd, state_cwd_length);
+               orig_path[state_cwd_length] = DEFAULT_SLASH;
+               memcpy(orig_path + state_cwd_length + 1, path, path_length + 1);
                path = orig_path;
                path_length = orig_path_len; 
        }