diff options
| author | Mark Wielaard <[email protected]> | 2018-08-18 19:51:27 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2018-08-18 20:07:06 +0200 |
| commit | 6983e59b727458a6c64d9659c85f08218bc4fcda (patch) | |
| tree | d26cadddf19e0e5bd7e2dc22beeddac6b15eb279 /libdw/dwarf_hasattr.c | |
| parent | 29e31978ba51c1051743a503ee325b5ebc03d7e9 (diff) | |
libdw: Check end of attributes list consistently.
dwarf_child (__libdw_find_attr), dwarf_getabbrevattr[_data] and
dwarf_getattrs all assume the end of the attribute list is when
both the name (code) and form of the attribute are zero.
dwarf_getabbrev (__libdw_getabbrev) and dwarf_hasattr assume the
end of the attribute list is when either the name (code) or the
form of the attribute is zero.
The DWARF spec says: "The series of attribute specifications ends
with an entry containing 0 for the name and 0 for the form." So
the first check is correct.
Make sure dwarf_getabbrev and dwarf_hasattr use the same check.
This is important since all other functions expect dwarf_getabbrev
(__libdw_getabbrev) to have done a data sanity check of the attribute.
So if the ending condition is different it could cause a crash.
https://sourceware.org/bugzilla/show_bug.cgi?id=23529
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'libdw/dwarf_hasattr.c')
| -rw-r--r-- | libdw/dwarf_hasattr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libdw/dwarf_hasattr.c b/libdw/dwarf_hasattr.c index 90053b13..eca08394 100644 --- a/libdw/dwarf_hasattr.c +++ b/libdw/dwarf_hasattr.c @@ -60,8 +60,8 @@ dwarf_hasattr (Dwarf_Die *die, unsigned int search_name) unsigned int attr_form; get_uleb128_unchecked (attr_form, attrp); - /* We can stop if we found the attribute with value zero. */ - if (attr_name == 0 || attr_form == 0) + /* We can stop if we found the end of the attribute list. */ + if (attr_name == 0 && attr_form == 0) return 0; if (attr_name == search_name) |