drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* hookapi.cc (hook_or_detect_cygwin): Simplify very slightly. 

* spawn.cc (av::fixup): Guard against problems reading an executable which does
not match Microsoft's documentation about PE format.
This commit is contained in:
Christopher Faylor 2005-09-15 00:02:57 +00:00
parent ae37cc1218
commit 59960f651d
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-14 Christopher Faylor <cgf@timesys.com>
* hookapi.cc (hook_or_detect_cygwin): Simplify very slightly.
* spawn.cc (av::fixup): Guard against problems reading an executable
which does not match Microsoft's documentation about PE format.
2005-09-14 Christopher Faylor <cgf@timesys.com> 2005-09-14 Christopher Faylor <cgf@timesys.com>
* spawn.cc (av::error): Eliminate. * spawn.cc (av::error): Eliminate.

2
winsup/cygwin/hookapi.cc
View File

@ -185,7 +185,7 @@ hook_or_detect_cygwin (const char *name, const void *fn)
function_hook fh; function_hook fh;
fh.origfn = NULL; fh.origfn = NULL;
fh.hookfn = fn; fh.hookfn = fn;
char *buf = fn ? NULL : (char *) alloca (strlen (name) + strlen ("64") + sizeof ("_")); char *buf = fn ? NULL : (char *) alloca (strlen (name) + sizeof ("_64"));
int i; int i;
// Iterate through each import descriptor, and redirect if appropriate // Iterate through each import descriptor, and redirect if appropriate
for (PIMAGE_IMPORT_DESCRIPTOR pd = pdfirst; pd->FirstThunk; pd++) for (PIMAGE_IMPORT_DESCRIPTOR pd = pdfirst; pd->FirstThunk; pd++)

39
winsup/cygwin/spawn.cc
View File

@ -1020,6 +1020,15 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path,
bool exeext = strcasematch (ext, ".exe"); bool exeext = strcasematch (ext, ".exe");
if (exeext && real_path.iscygexec ()) if (exeext && real_path.iscygexec ())
return 0; return 0;
char *buf = NULL;
myfault efault;
if (efault.faulted ())
{
if (buf)
UnmapViewOfFile (buf);
real_path.set_cygexec (false);
return 0;
}
while (1) while (1)
{ {
HANDLE h = CreateFile (real_path, GENERIC_READ, HANDLE h = CreateFile (real_path, GENERIC_READ,
@ -1033,22 +1042,32 @@ av::fixup (child_info_types chtype, const char *prog_arg, path_conv& real_path,
CloseHandle (h); CloseHandle (h);
if (!hm) if (!hm)
goto err; goto err;
char *buf = (char *) MapViewOfFile(hm, FILE_MAP_READ, 0, 0, 0); buf = (char *) MapViewOfFile(hm, FILE_MAP_READ, 0, 0, 0);
CloseHandle (hm); CloseHandle (hm);
if (!buf) if (!buf)
goto err; goto err;
if (buf[0] == 'M' && buf[1] == 'Z') do
{ {
unsigned off = (unsigned char) buf[0x18] | (((unsigned char) buf[0x19]) << 8); myfault efault;
win16_exe = off < sizeof (IMAGE_DOS_HEADER); if (efault.faulted ())
if (!win16_exe) {
real_path.set_cygexec (!!hook_or_detect_cygwin (buf, NULL)); UnmapViewOfFile (buf);
UnmapViewOfFile (buf); real_path.set_cygexec (false);
break; break;
} }
if (buf[0] == 'M' && buf[1] == 'Z')
{
unsigned off = (unsigned char) buf[0x18] | (((unsigned char) buf[0x19]) << 8);
win16_exe = off < sizeof (IMAGE_DOS_HEADER);
if (!win16_exe)
real_path.set_cygexec (!!hook_or_detect_cygwin (buf, NULL));
UnmapViewOfFile (buf);
break;
}
} while (0);
debug_printf ("%s is a script", (char *) real_path); debug_printf ("%s is possibly a script", (char *) real_path);
if (real_path.has_acls () && allow_ntsec if (real_path.has_acls () && allow_ntsec
&& check_file_access (real_path, X_OK)) && check_file_access (real_path, X_OK))