* path.cc (cwdstuff::set): Make sure drive_length is 0 for virtual

paths.  Add comments.
	* spawn.cc (spawn_guts): Don't allow to start a native Win32 application
	from a long path or a virtual path.  Print an error message to stderr.
This commit is contained in:
Corinna Vinschen
2008-03-11 12:34:08 +00:00
parent becf251f67
commit 6c968f611b
3 changed files with 27 additions and 3 deletions

View File

@@ -4630,9 +4630,11 @@ cwdstuff::set (PUNICODE_STRING nat_cwd, const char *posix_cwd, bool doit)
}
/* Make sure it's NUL-termniated. */
win32.Buffer[win32.Length / sizeof (WCHAR)] = L'\0';
if (win32.Buffer[1] == L':')
if (!doit) /* Virtual path */
drive_length = 0;
else if (win32.Buffer[1] == L':') /* X: */
drive_length = 2;
else if (win32.Buffer[1] == L'\\')
else if (win32.Buffer[1] == L'\\') /* UNC path */
{
PWCHAR ptr = wcschr (win32.Buffer + 2, L'\\');
if (ptr)
@@ -4642,7 +4644,7 @@ cwdstuff::set (PUNICODE_STRING nat_cwd, const char *posix_cwd, bool doit)
else
drive_length = win32.Length / sizeof (WCHAR);
}
else
else /* Shouldn't happen */
drive_length = 0;
tmp_pathbuf tp;