Commit eedff184 authored by Koichi Arakawa's avatar Koichi Arakawa Committed by Eli Zaretskii

Avoid segfaults on MS-Windows when invoking subprocesses (Bug#20264)

 src/w32proc.c (w32_executable_type): Look for the DLL name in the
 correct section.  This avoids segfaults with some executables.
parent 7471fc47
2015-04-06 Koichi Arakawa <arakawa@pp.iij4u.or.jp> (tiny change)
* w32proc.c (w32_executable_type): Look for the DLL name in the
correct section. This avoids segfaults with some executables.
(Bug#20264)
2015-04-04 Jan Djärv <jan.h.d@swipnet.se>
* xselect.c (x_reply_selection_request)
......
......@@ -1613,24 +1613,25 @@ w32_executable_type (char * filename,
#endif
if (data_dir)
{
/* Look for cygwin.dll in DLL import list. */
/* Look for Cygwin DLL in the DLL import list. */
IMAGE_DATA_DIRECTORY import_dir =
data_dir[IMAGE_DIRECTORY_ENTRY_IMPORT];
IMAGE_IMPORT_DESCRIPTOR * imports;
IMAGE_SECTION_HEADER * section;
section = rva_to_section (import_dir.VirtualAddress, nt_header);
imports = RVA_TO_PTR (import_dir.VirtualAddress, section,
executable);
IMAGE_IMPORT_DESCRIPTOR * imports =
RVA_TO_PTR (import_dir.VirtualAddress,
rva_to_section (import_dir.VirtualAddress,
nt_header),
executable);
for ( ; imports->Name; imports++)
{
IMAGE_SECTION_HEADER * section =
rva_to_section (imports->Name, nt_header);
char * dllname = RVA_TO_PTR (imports->Name, section,
executable);
/* The exact name of the cygwin dll has changed with
various releases, but hopefully this will be reasonably
future proof. */
/* The exact name of the Cygwin DLL has changed with
various releases, but hopefully this will be
reasonably future-proof. */
if (strncmp (dllname, "cygwin", 6) == 0)
{
*is_cygnus_app = TRUE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment