Update the documentation in __libdw_form_val_compute_len for handling
DW_FORM_indirect and make sure the indirect form isn't DW_FORM_indirect
itself or DW_FORM_implicit_const.
Signed-off-by: Mark Wielaard <mark@klomp.org>
+2021-05-01 Mark Wielaard <mark@klomp.org>
+
+ * libdw_form.c (__libdw_form_val_compute_len): Check indirect
+ form is not DW_FORM_indirect or DW_FORM_implicit_const.
+
2021-04-23 Omar Sandoval <osandov@fb.com>
* dwarf_child.c (__libdw_find_attr): Handle DW_FORM_indirect.
break;
case DW_FORM_indirect:
+ /* The amount of data to skip in the DIE is the size of the actual
+ FORM data (which is __libdw_form_val_len) plus the size of the
+ uleb128 encoding that FORM (which is valp - startp). */
get_uleb128 (u128, valp, endp);
- // XXX Is this really correct?
+ if (*valp == DW_FORM_indirect || *valp == DW_FORM_implicit_const)
+ return (size_t) -1;
result = __libdw_form_val_len (cu, u128, valp);
if (result != (size_t) -1)
result += valp - startp;