Fix infinite loop in is_linked_with_cygwin_dll

There were some Windows timeouts after the last merge.  Debugging
showed that these were caused by an infinite loop in
is_linked_with_cygwin_dll when reading C:\Windows\SysWOW64\win32u.dll.

This patch fixes the problem by ensuring that the loop always makes
progress.

gdb/ChangeLog
2020-04-23  Tom Tromey  <tromey@adacore.com>

	* windows-tdep.c (is_linked_with_cygwin_dll): Always update "iter"
	in loop.
This commit is contained in:
Tom Tromey 2020-04-23 12:15:28 -06:00
parent 5939967b35
commit 29514b8728
2 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2020-04-23 Tom Tromey <tromey@adacore.com>
* windows-tdep.c (is_linked_with_cygwin_dll): Always update "iter"
in loop.
2020-04-23 Luis Machado <luis.machado@linaro.org>
* dwarf2/frame-tailcall.c (dwarf2_tailcall_sniffer_first): Use

View File

@ -1071,18 +1071,19 @@ range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
const gdb_byte *name = &idata_contents[name_va - idata_section_va];
/* Make sure we don't overshoot the end of the section with the streq. */
if (name + sizeof (CYGWIN_DLL_NAME) > end)
continue;
/* Finally, check if this is the dll name we are looking for. */
if (streq ((const char *) name, CYGWIN_DLL_NAME))
return true;
/* Make sure we don't overshoot the end of the section with the
streq. */
if (name + sizeof (CYGWIN_DLL_NAME) <= end)
{
/* Finally, check if this is the dll name we are looking for. */
if (streq ((const char *) name, CYGWIN_DLL_NAME))
return true;
}
iter += sizeof (pe_import_directory_entry);
}
return false;
return false;
}
void _initialize_windows_tdep ();