mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-29 04:53:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows: Rely purely on event info when handling DLL load event

Browse Source 
When a DLL gets loaded an the debugger gets a debug event about it,
the currently implementation in handle_load_dll currently tries to
fetch the DLL's name by first iterating over all DLLs known to
the system.  It should be sufficient to rely on the name provided
with the event, however, especially in the situation we are now,
where we now know that we're past the statup phase for our inferior.

This patch therefore simplifies windows-nat.c::handle_load_dll to
only rely on the event's lpImageName.

It also updates the function's comment to document the assumption
regarding not being during the inferior's startup phase. And while
at it, it fixes the function documentation, which was probably
unintentionally inherited from another function (perhaps windows_wait).

gdb/ChangeLog:

	* windows-nat.c (handle_load_dll): Rewrite this function's
	introductory comment.  Remove code using get_module_name
	to get the DLL's name.
This commit is contained in:
Joel Brobecker 2014-02-03 03:03:39 -05:00
parent ea39ad355e
commit 1cd9feab11
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2014-02-20 Joel Brobecker <brobecker@adacore.com>
* windows-nat.c (handle_load_dll): Rewrite this function's
introductory comment. Remove code using get_module_name
to get the DLL's name.
2014-02-20 Joel Brobecker <brobecker@adacore.com>
* windows-nat.c (get_windows_debug_event): Ignore

39
gdb/windows-nat.c
View File

@ -835,45 +835,26 @@ get_image_name (HANDLE h, void *address, int unicode)
return buf;
}
/* Wait for child to do something. Return pid of child, or -1 in case
of error; store status through argument pointer OURSTATUS. */
/* Handle a DLL load event, and return 1.
This function assumes that this event did not occur during inferior
initialization, where their event info may be incomplete (see
do_initial_windows_stuff and windows_add_all_dlls for more info
on how we handle DLL loading during that phase). */
static int
handle_load_dll (void *dummy)
{
LOAD_DLL_DEBUG_INFO *event = &current_event.u.LoadDll;
char dll_buf[__PMAX];
char *dll_name = NULL;
dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
/* Try getting the DLL name by searching the list of known modules
and matching their base address against this new DLL's base address.
FIXME: brobecker/2013-12-10:
It seems odd to be going through this search if the DLL name could
simply be extracted via "event->lpImageName". Moreover, some
experimentation with various versions of Windows seem to indicate
that it might still be too early for this DLL to be listed when
querying the system about the current list of modules, thus making
this attempt pointless.
This code can therefore probably be removed. But at the time of
this writing, we are too close to creating the GDB 7.7 branch
for us to make such a change. We are therefore defering it. */
if (!get_module_name (event->lpBaseOfDll, dll_buf))
dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
dll_name = dll_buf;
char *dll_name;
/* Try getting the DLL name via the lpImageName field of the event.
Note that Microsoft documents this fields as strictly optional,
in the sense that it might be NULL. And the first DLL event in
particular is explicitly documented as "likely not pass[ed]"
(source: MSDN LOAD_DLL_DEBUG_INFO structure). */
if (*dll_name == '\0')
dll_name = get_image_name (current_process_handle,
event->lpImageName, event->fUnicode);
dll_name = get_image_name (current_process_handle,
event->lpImageName, event->fUnicode);
if (!dll_name)
return 1;