JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make ldd stop after any non-continuable exception

Browse Source 
Ensure that ldd always stops when the exception is flagged as
non-continuable.

Also arrange for ldd to exit with a non-zero exit code if something went
wrong which prevented us from listing all dynamic dependencies.

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
This commit is contained in:
Jon Turney 2017-04-04 18:47:44 +01:00
parent 961a6909d9
commit a9da3e4e67
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
winsup/utils/ldd.cc
View File

@ -302,6 +302,9 @@ report (const char *in_fn, bool multiple)
dlls dll_list = {}; dlls dll_list = {};
dlls *dll_last = &dll_list; dlls *dll_last = &dll_list;
const wchar_t *process_fn = NULL; const wchar_t *process_fn = NULL;
int res = 0;
while (1) while (1)
{ {
bool exitnow = false; bool exitnow = false;
@ -356,6 +359,11 @@ report (const char *in_fn, bool multiple)
TerminateProcess (hProcess, 0); TerminateProcess (hProcess, 0);
break; break;
} }
if (ev.u.Exception.ExceptionRecord.ExceptionFlags &
EXCEPTION_NONCONTINUABLE) {
res = 1;
goto print_and_exit;
}
break; break;
case EXIT_PROCESS_DEBUG_EVENT: case EXIT_PROCESS_DEBUG_EVENT:
print_and_exit: print_and_exit:
@ -374,7 +382,7 @@ print_and_exit:
break; break;
} }
return 0; return res;
} }
int int