dwarf_next_cfi.c: Fix version 4 return_address_register decoding.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 7a1078904582390b909bb5eeab46ad3f715819eb..5672082e713d1ae427d11bd00b6161674fb92973 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,7 @@
 2010-06-16  Roland McGrath  <roland@redhat.com>
 
+       * dwarf_next_cfi.c: Fix version 4 return_address_register decoding.
+
        * fde.c (fde_by_offset): Renamed to ...
        (__libdw_fde_by_offset): ... this, made global and internal_function.
        Don't take ADDRESS argument.

diff --git a/libdw/dwarf_next_cfi.c b/libdw/dwarf_next_cfi.c
index fa7d09a75b282f12f332db926a3c6e71eb4db541..0e90457d09e0592bca5e365e5b549773907b53f1 100644 (file)
--- a/libdw/dwarf_next_cfi.c
+++ b/libdw/dwarf_next_cfi.c
@@ -194,7 +194,7 @@ dwarf_next_cfi (e_ident, data, eh_frame_p, off, next_off, entry)
       get_uleb128 (entry->cie.code_alignment_factor, bytes);
       get_sleb128 (entry->cie.data_alignment_factor, bytes);
 
-      if (version == 3)                /* DWARF 3 */
+      if (version >= 3)                /* DWARF 3+ */
        get_uleb128 (entry->cie.return_address_register, bytes);
       else                     /* DWARF 2 */
        entry->cie.return_address_register = *bytes++;