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

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index d9e6e654d37c1c9041ebfb6114b4743e2e2a107c..db8b966f317dcdc516373d7b482f5f758d885b15 100644 (file)
--- 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 b02bfafbebe0f79fa97dd2ccdeddfa0e5f856eb6..e851a1f47c29c4263f60d8d59a8a59dcd096e04f 100644 (file)
--- 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 a3cf6243a028af31d92ee2feedb316192ce445bc..36a495f1c60823c2f92b5229787336872bd578cf 100644 (file)
--- 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)