From b688d001ee77e7c8ca536ced974ef713424c11e2 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Tue, 6 Mar 2018 14:16:41 +0100
Subject: [PATCH] Fix DW_CFA_remember_state (#184)

* Fix #103

* Fix description for DW_CFA_def_cfa_expression

* Add test file for issue #103
---
 elftools/dwarf/callframe.py             |   4 +++-
 elftools/dwarf/descriptions.py          |   3 ++-
 test/testfiles_for_readelf/issue103.elf | Bin 0 -> 7376 bytes
 3 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 test/testfiles_for_readelf/issue103.elf

diff --git a/elftools/dwarf/callframe.py b/elftools/dwarf/callframe.py
index e64c745..bcef78d 100644
--- a/elftools/dwarf/callframe.py
+++ b/elftools/dwarf/callframe.py
@@ -567,9 +567,11 @@ class CFIEntry(object):
                 else:
                     cur_line.pop(instr.args[0], None)
             elif name == 'DW_CFA_remember_state':
-                line_stack.append(cur_line)
+                line_stack.append(copy.deepcopy(cur_line))
             elif name == 'DW_CFA_restore_state':
+                pc = cur_line['pc']
                 cur_line = line_stack.pop()
+                cur_line['pc'] = pc
 
         # The current line is appended to the table after all instructions
         # have ended, if there were instructions.
diff --git a/elftools/dwarf/descriptions.py b/elftools/dwarf/descriptions.py
index 3a07607..eb20333 100644
--- a/elftools/dwarf/descriptions.py
+++ b/elftools/dwarf/descriptions.py
@@ -104,7 +104,8 @@ def describe_CFI_instructions(entry):
         elif name == 'DW_CFA_def_cfa_expression':
             expr_dumper = ExprDumper(entry.structs)
             expr_dumper.process_expr(instr.args[0])
-            s += '  %s: (%s)\n' % (name, expr_dumper.get_str())
+            # readelf output is missing a colon for DW_CFA_def_cfa_expression
+            s += '  %s (%s)\n' % (name, expr_dumper.get_str())
         elif name == 'DW_CFA_expression':
             expr_dumper = ExprDumper(entry.structs)
             expr_dumper.process_expr(instr.args[1])
diff --git a/test/testfiles_for_readelf/issue103.elf b/test/testfiles_for_readelf/issue103.elf
new file mode 100644
index 0000000000000000000000000000000000000000..8c37a7cc32ba5ca23b90584a3240579309fa54c5
GIT binary patch
literal 7376
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
F|6j5iT<rh=

literal 0
HcmV?d00001

-- 
2.30.2