m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-11-16 13:18:12 +01:00
Code Issues Releases Activity

dwarf: Fix size of state to avoid corrupting rs_stack

Browse source 
DW_CFA_remember_state used memcpy to overwrite state with the value
of rs_current. Unfortunately rs_current was slightly larger than state,
possibly resulting in rs_stack->next being overwritten.

Fix this by making the type of state match the type of rs_current and
using an assigment to perform the copy rather than memcpy. This should
ensure that the types match in future.
This commit is contained in:
Michael Munday 2017-11-24 11:37:11 -05:00 committed by Dave Watson
parent 02a3cc2cf3
commit 29137c6fa9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/dwarf.h
View file

@ -260,7 +260,7 @@ dwarf_reg_state_t;
typedef struct dwarf_stackable_reg_state
{
struct dwarf_stackable_reg_state *next; /* for rs_stack */
dwarf_reg_only_state_t state;
dwarf_reg_state_t state;
}
dwarf_stackable_reg_state_t;

4
src/dwarf/Gparser.c
View file

@ -275,7 +275,7 @@ run_cfi_program (struct dwarf_cursor *c, dwarf_state_record_t *sr,
ret = -UNW_ENOMEM;
break;
}
memcpy (&(*rs_stack)->state, &sr->rs_current, sizeof (sr->rs_current));
(*rs_stack)->state = sr->rs_current;
Debug (15, "CFA_remember_state\n");
break;
@ -286,7 +286,7 @@ run_cfi_program (struct dwarf_cursor *c, dwarf_state_record_t *sr,
ret = -UNW_EINVAL;
break;
}
memcpy (&sr->rs_current, &(*rs_stack)->state, sizeof (sr->rs_current));
sr->rs_current = (*rs_stack)->state;
pop_rstate_stack(rs_stack);
Debug (15, "CFA_restore_state\n");
break;