PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,10 @@
2008-03-11 Corinna Vinschen <corinna@vinschen.de>
* 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.
2008-03-11 Corinna Vinschen <corinna@vinschen.de>
* environ.cc (parse_options): Use tmp_pathbuf to allocate buffer.

8
winsup/cygwin/path.cc
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;

15
winsup/cygwin/spawn.cc
View File

@ -361,6 +361,21 @@ spawn_guts (const char * prog_arg, const char *const *argv,
wascygexec = real_path.iscygexec ();
res = newargv.fixup (prog_arg, real_path, ext);
if (!real_path.iscygexec ()
&& (cygheap->cwd.drive_length == 0
|| cygheap->cwd.win32.Length >= MAX_PATH * sizeof (WCHAR)))
{
small_printf ("Error: Current working directory is a %s.\n"
"Can't start native Windows application from here.\n\n",
cygheap->cwd.drive_length == 0
? "virtual Cygwin directory"
: "path longer than allowed for a\n"
"Win32 working directory");
set_errno (ENAMETOOLONG);
res = -1;
goto out;
}
if (res)
goto out;