mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-08-02 19:46:09 +08:00
* 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:
@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user