From: Mark Wielaard <mjw@redhat.com>
Date: Tue, 2 Feb 2010 14:45:24 +0000 (+0100)
Subject: Always set bias in dwfl_module_dwarf_cfi() and dwfl_module_eh_cfi().
X-Git-Tag: elfutils-0.145~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eacdcf3e86653b97932f3d6e35c9271b3f406369;p=thirdparty%2Felfutils.git

Always set bias in dwfl_module_dwarf_cfi() and dwfl_module_eh_cfi().
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index d9e6e654d..db8b966f3 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Mark Wielaard  <mjw@redhat.com>
+
+	* dwfl_module_dwarf_cfi.c (dwfl_module_dwarf_cfi): Always set bias.
+	* dwfl_module_eh_cfi.c (dwfl_module_eh_cfi): Likewise
+
 2010-01-07  Roland McGrath  <roland@redhat.com>
 
 	* core-file.c (dwfl_core_file_report): Use elf_getphdrnum.
diff --git a/libdwfl/dwfl_module_dwarf_cfi.c b/libdwfl/dwfl_module_dwarf_cfi.c
index b02bfafbe..e851a1f47 100644
--- a/libdwfl/dwfl_module_dwarf_cfi.c
+++ b/libdwfl/dwfl_module_dwarf_cfi.c
@@ -80,7 +80,10 @@ dwfl_module_dwarf_cfi (mod, bias)
     return NULL;
 
   if (mod->dwarf_cfi != NULL)
-    return mod->dwarf_cfi;
+    {
+      *bias = mod->debug.bias;
+      return mod->dwarf_cfi;
+    }
 
   return __libdwfl_set_cfi (mod, &mod->dwarf_cfi,
 			    INTUSE(dwarf_getcfi)
diff --git a/libdwfl/dwfl_module_eh_cfi.c b/libdwfl/dwfl_module_eh_cfi.c
index a3cf6243a..36a495f1c 100644
--- a/libdwfl/dwfl_module_eh_cfi.c
+++ b/libdwfl/dwfl_module_eh_cfi.c
@@ -59,7 +59,10 @@ dwfl_module_eh_cfi (mod, bias)
     return NULL;
 
   if (mod->eh_cfi != NULL)
-    return mod->eh_cfi;
+    {
+      *bias = mod->main.bias;
+      return mod->eh_cfi;
+    }
 
   __libdwfl_getelf (mod);
   if (mod->elferr != DWFL_E_NOERROR)