OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Makefile.in: Update dependencies. 

* dwarf2expr.c: New include "gdb_assert.h".
	(new_dwarf_expr_context): Initialize MAX_RECURSION_DEPTH.
	(dwarf_expr_eval): Sanity check the RECURSION_DEPTH count.
	(execute_stack_op): Error out on too large RECURSION_DEPTH.
	Increase/decrease RECURSION_DEPTH around the function.
This commit is contained in:
Jan Kratochvil 2008-06-05 18:25:30 +00:00
parent f0b886e312
commit 1e3a102aba
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,3 +1,12 @@
2008-06-05 Jan Kratochvil <jan.kratochvil@redhat.com>
* Makefile.in: Update dependencies.
* dwarf2expr.c: New include "gdb_assert.h".
(new_dwarf_expr_context): Initialize MAX_RECURSION_DEPTH.
(dwarf_expr_eval): Sanity check the RECURSION_DEPTH count.
(execute_stack_op): Error out on too large RECURSION_DEPTH.
Increase/decrease RECURSION_DEPTH around the function.
2008-06-05 Daniel Jacobowitz <dan@codesourcery.com>
* remote.c (get_offsets): Handle a single segment.

2
gdb/Makefile.in
View File

@ -2087,7 +2087,7 @@ dummy-frame.o: dummy-frame.c $(defs_h) $(dummy_frame_h) $(regcache_h) \
dfp.o: dfp.c $(defs_h) $(expression_h) $(gdbtypes_h) $(value_h) $(dfp_h) \
$(decimal128_h) $(decimal64_h) $(decimal32_h)
dwarf2expr.o: dwarf2expr.c $(defs_h) $(symtab_h) $(gdbtypes_h) $(value_h) \
$(gdbcore_h) $(elf_dwarf2_h) $(dwarf2expr_h)
$(gdbcore_h) $(elf_dwarf2_h) $(dwarf2expr_h) $(gdb_assert_h)
dwarf2-frame.o: dwarf2-frame.c $(defs_h) $(dwarf2expr_h) $(elf_dwarf2_h) \
$(frame_h) $(frame_base_h) $(frame_unwind_h) $(gdbcore_h) \
$(gdbtypes_h) $(symtab_h) $(objfiles_h) $(regcache_h) \

16
gdb/dwarf2expr.c
View File

@ -27,6 +27,7 @@
#include "gdbcore.h"
#include "elf/dwarf2.h"
#include "dwarf2expr.h"
#include "gdb_assert.h"
/* Local prototypes. */
@ -46,6 +47,7 @@ new_dwarf_expr_context (void)
retval->stack = xmalloc (retval->stack_allocated * sizeof (CORE_ADDR));
retval->num_pieces = 0;
retval->pieces = 0;
retval->max_recursion_depth = 0x100;
return retval;
}
@ -134,7 +136,13 @@ add_piece (struct dwarf_expr_context *ctx,
void
dwarf_expr_eval (struct dwarf_expr_context *ctx, gdb_byte *addr, size_t len)
{
int old_recursion_depth = ctx->recursion_depth;
execute_stack_op (ctx, addr, addr + len);
/* CTX RECURSION_DEPTH becomes invalid if an exception was thrown here. */
gdb_assert (ctx->recursion_depth == old_recursion_depth);
}
/* Decode the unsigned LEB128 constant at BUF into the variable pointed to
@ -281,6 +289,11 @@ execute_stack_op (struct dwarf_expr_context *ctx,
ctx->in_reg = 0;
ctx->initialized = 1; /* Default is initialized. */
if (ctx->recursion_depth > ctx->max_recursion_depth)
error (_("DWARF-2 expression error: Loop detected (%d)."),
ctx->recursion_depth);
ctx->recursion_depth++;
while (op_ptr < op_end)
{
enum dwarf_location_atom op = *op_ptr++;
@ -739,4 +752,7 @@ execute_stack_op (struct dwarf_expr_context *ctx,
dwarf_expr_push (ctx, result);
no_push:;
}
ctx->recursion_depth--;
gdb_assert (ctx->recursion_depth >= 0);
}