From 82a6336fd0b128ee213e03f4e35c73bee91d5c01 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 30 Jun 2010 01:18:43 -0700 Subject: [PATCH] libdwfl: Fix debuginfo search when dwfl_build_id_find_debuginfo closes fd on success. --- libdwfl/ChangeLog | 2 ++ libdwfl/find-debuginfo.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 5620e23c4..f0a8529d2 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -3,6 +3,8 @@ * linux-kernel-modules.c (dwfl_linux_kernel_find_elf): Don't be confused by -1 return from dwfl_build_id_find_elf after it opened the Elf handle. + * find-debuginfo.c (dwfl_standard_find_debuginfo): Likewise for + dwfl_build_id_find_debuginfo. 2010-06-16 Roland McGrath diff --git a/libdwfl/find-debuginfo.c b/libdwfl/find-debuginfo.c index 19d5f907d..f6f802e25 100644 --- a/libdwfl/find-debuginfo.c +++ b/libdwfl/find-debuginfo.c @@ -265,7 +265,7 @@ dwfl_standard_find_debuginfo (Dwfl_Module *mod, NULL, NULL, 0, NULL, NULL, 0, debuginfo_file_name); - if (fd >= 0 || errno != 0) + if (fd >= 0 || mod->debug.elf != NULL || errno != 0) return fd; } -- 2.47.3