* dwarf2loc.c (dwarf_expr_frame_base): Add check for the return value of get_frame_block.

This commit is contained in:
Hui Zhu 2012-12-06 01:11:32 +00:00
parent 8fbb09e83e
commit c90a077350
2 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2012-12-06 Hui Zhu <hui_zhu@mentor.com>
* dwarf2loc.c (dwarf_expr_frame_base): Add check for the return
value of get_frame_block.
2012-12-05 Pierre Muller <muller@sourceware.org>
Avoid memory leaks on struct cmd_list_element.doc field.

View File

@ -332,11 +332,15 @@ dwarf_expr_frame_base (void *baton, const gdb_byte **start, size_t * length)
this_base method. */
struct symbol *framefunc;
struct dwarf_expr_baton *debaton = (struct dwarf_expr_baton *) baton;
struct block *bl = get_frame_block (debaton->frame, NULL);
if (bl == NULL)
error (_("frame address is not available."));
/* Use block_linkage_function, which returns a real (not inlined)
function, instead of get_frame_function, which may return an
inlined function. */
framefunc = block_linkage_function (get_frame_block (debaton->frame, NULL));
framefunc = block_linkage_function (bl);
/* If we found a frame-relative symbol then it was certainly within
some function associated with a frame. If we can't find the frame,