diff options
| author | Branko Čibej <brane@apache.org> | 2015-06-18 08:42:20 +0000 |
|---|---|---|
| committer | Branko Čibej <brane@apache.org> | 2015-06-18 08:42:20 +0000 |
| commit | 49e9f6ee6a1497899255b7c416eda2e19a2edb1d (patch) | |
| tree | 711e097a982e62984196b88d474b8e4a3a0275e6 /file_io/win32 | |
| parent | c95be18f0591063bbba3ee8f21ebc99f4188de67 (diff) | |
| download | apr-49e9f6ee6a1497899255b7c416eda2e19a2edb1d.tar.gz | |
Merged r1685929 from trunk:
apr_filepath_merge: Fix truename length calculation on Windows
in cases where the "short" name variant is actually longer than
the "long" or "true" name.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1686149 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'file_io/win32')
| -rw-r--r-- | file_io/win32/filepath.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/file_io/win32/filepath.c b/file_io/win32/filepath.c index 559d1b28c..5dbe5aea9 100644 --- a/file_io/win32/filepath.c +++ b/file_io/win32/filepath.c @@ -890,9 +890,9 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, memmove(path + keptlen + namelen + 1, path + keptlen + seglen + 1, pathlen - keptlen - seglen); - pathlen += namelen - seglen; - seglen = namelen; } + pathlen += namelen - seglen; + seglen = namelen; } else { /* namelen > seglen */ if (pathlen + namelen - seglen >= sizeof(path)) |