From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jun 2010 08:18:43 +0000 (-0700)
Subject: libdwfl: Fix debuginfo search when dwfl_build_id_find_debuginfo closes fd on success.
X-Git-Tag: elfutils-0.149~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82a6336fd0b128ee213e03f4e35c73bee91d5c01;p=thirdparty%2Felfutils.git

libdwfl: Fix debuginfo search when dwfl_build_id_find_debuginfo closes fd on success.
---

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  <roland@redhat.com>
 
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;
     }