JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cygwin: normalize_win32_path: improve error checking

Browse Source 
If the source path starts with the Win32 long path prefix '\\?\' or
the NT object directory prefix '\??\', require the prefix to be
followed by 'UNC\' or '<drive letter>:\'.  Otherwise return EINVAL.

This fixes the assertion failure in symlink_info::check that was
reported here:

  https://cygwin.com/ml/cygwin/2019-09/msg00228.html

That assertion failure was caused by normalize_win32_path returning a
path with no backslashes when the source path was '\\?\DRIVE'.
This commit is contained in:
Ken Brown 2019-09-25 14:18:18 -04:00
parent e1a0775dc0
commit 283cb372e4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/path.cc
View File

@ -1406,15 +1406,18 @@ normalize_win32_path (const char *src, char *dst, char *&tail)
bool beg_src_slash = isdirsep (src[0]); bool beg_src_slash = isdirsep (src[0]);
tail = dst; tail = dst;
/* Skip long path name prefixes in Win32 or NT syntax. */ /* Skip Win32 long path name prefix and NT object directory prefix. */
if (beg_src_slash && (src[1] == '?' || isdirsep (src[1])) if (beg_src_slash && (src[1] == '?' || isdirsep (src[1]))
&& src[2] == '?' && isdirsep (src[3])) && src[2] == '?' && isdirsep (src[3]))
{ {
src += 4; src += 4;
if (src[1] != ':') /* native UNC path */ if (isdrive (src) && isdirsep (src[2]))
beg_src_slash = false;
else if (!strncmp (src, "UNC", 3) && isdirsep (src[3]))
/* native UNC path */
src += 2; /* Fortunately the first char is not copied... */ src += 2; /* Fortunately the first char is not copied... */
else else
beg_src_slash = false; return EINVAL;
} }
if (beg_src_slash && isdirsep (src[1])) if (beg_src_slash && isdirsep (src[1]))
{ {