aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Wang <kaiw@FreeBSD.org>2014-01-19 13:42:49 +0000
committerKai Wang <kaiw@FreeBSD.org>2014-01-19 13:42:49 +0000
commitbc5fce8d8f854b49cfc338425fc1eb948486727b (patch)
tree68eb5dd826cb2e2d42ff6b232b048021fbaa1a53
parent255d921adcedcece0bcac9b966b28ed85e3c6526 (diff)
downloadsrc-bc5fce8d8f854b49cfc338425fc1eb948486727b.tar.gz
src-bc5fce8d8f854b49cfc338425fc1eb948486727b.zip
* Allow API dwarf_loclist_n() and dwarf_loclist() to be called with
attributes that have form DW_FORM_sec_offset. * If the .debug_info section conforms to DWARF4, do not allow the value of attributes with form DW_FORM_data[48] to be used as section offset.
Notes
Notes: svn path=/projects/elftoolchain/; revision=260879
-rw-r--r--contrib/elftoolchain/libdwarf/dwarf_loclist.c29
1 files changed, 27 insertions, 2 deletions
diff --git a/contrib/elftoolchain/libdwarf/dwarf_loclist.c b/contrib/elftoolchain/libdwarf/dwarf_loclist.c
index cf6fa9dc9f8e..4696bc52847d 100644
--- a/contrib/elftoolchain/libdwarf/dwarf_loclist.c
+++ b/contrib/elftoolchain/libdwarf/dwarf_loclist.c
@@ -56,8 +56,20 @@ dwarf_loclist_n(Dwarf_Attribute at, Dwarf_Locdesc ***llbuf,
switch (at->at_form) {
case DW_FORM_data4:
case DW_FORM_data8:
- ret = _dwarf_loclist_find(at->at_die->die_dbg,
- at->at_die->die_cu, at->u[0].u64, &ll, error);
+ /*
+ * DW_FORM_data[48] can not be used as section offset
+ * since DWARF4. For DWARF[23], the application needs
+ * to determine if DW_FORM_data[48] is representing
+ * a constant or a section offset.
+ */
+ if (at->at_die->die_cu->cu_version >= 4) {
+ DWARF_SET_ERROR(dbg, error, DW_DLE_NO_ENTRY);
+ return (DW_DLV_NO_ENTRY);
+ }
+ /* FALLTHROUGH */
+ case DW_FORM_sec_offset:
+ ret = _dwarf_loclist_find(dbg, at->at_die->die_cu,
+ at->u[0].u64, &ll, error);
if (ret == DW_DLE_NO_ENTRY) {
DWARF_SET_ERROR(dbg, error, ret);
return (DW_DLV_NO_ENTRY);
@@ -119,6 +131,19 @@ dwarf_loclist(Dwarf_Attribute at, Dwarf_Locdesc **llbuf,
switch (at->at_form) {
case DW_FORM_data4:
case DW_FORM_data8:
+ /*
+ * DW_FORM_data[48] can not be used as section offset
+ * since DWARF4. For DWARF[23], the application needs
+ * to determine if DW_FORM_data[48] is representing
+ * a constant or a section offset.
+ */
+ if (at->at_die->die_cu->cu_version >= 4) {
+ printf("called cu_version >= 4\n");
+ DWARF_SET_ERROR(dbg, error, DW_DLE_NO_ENTRY);
+ return (DW_DLV_NO_ENTRY);
+ }
+ /* FALLTHROUGH */
+ case DW_FORM_sec_offset:
ret = _dwarf_loclist_find(at->at_die->die_dbg,
at->at_die->die_cu, at->u[0].u64, &ll, error);
if (ret == DW_DLE_NO_ENTRY) {