Skip to content

bug fix: ldd silent about missing dll dependencies #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: msys2-3_1_7-release
Choose a base branch
from
Open

bug fix: ldd silent about missing dll dependencies #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc9f003
ldd.cc: bug fix - handle case when dll dependencies are not found
jannick0 Dec 12, 2020
cf63a5f
ldd.cc: fix memory leakage
jannick0 Dec 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion winsup/utils/ldd.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,19 @@ static struct filelist
char *name;
} *head;

static void
destroy_filelist (struct filelist **phead)
{
struct filelist *next, *head = *phead;
while (head) {
next = head->next;
free (head->name);
free (head);
head = next;
}
*phead = NULL;
}

static bool
saw_file (char *name)
{
Expand Down Expand Up @@ -248,6 +261,18 @@ struct dlls
struct dlls *next;
};

static void
destroy_dlls (struct dlls *dlls)
{
struct dlls* next;
while (dlls) {
next = dlls->next;
free (dlls);
dlls = next;
}

}

#define SLOP strlen (" (?)")
char *
tocyg (wchar_t *win_fn)
Expand Down Expand Up @@ -280,7 +305,7 @@ tocyg (wchar_t *win_fn)
static int
print_dlls (dlls *dll, const wchar_t *dllfn, const wchar_t *process_fn)
{
head = NULL; /* FIXME: memory leak */
destroy_filelist(&head);
while ((dll = dll->next))
{
char *fn;
Expand Down Expand Up @@ -407,6 +432,13 @@ report (const char *in_fn, bool multiple)
}
break;
case EXIT_PROCESS_DEBUG_EVENT:
if (ev.u.ExitProcess.dwExitCode != 0)
{
/* All dll dependencies were NOT found. */
process_fn = fn_win;
res = 1;
}

print_and_exit:
print_dlls (&dll_list, isdll ? fn_win : NULL, process_fn);
exitnow = true;
Expand All @@ -423,6 +455,9 @@ report (const char *in_fn, bool multiple)
break;
}

/* cleanup */
destroy_dlls(dll_list.next);

return res;
}

Expand Down