You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.0 KiB
59 lines
2.0 KiB
8 months ago
|
From 72317b333b85eed483ad00bcd4f40944019a7c13 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "xtkoba+ruby@gmail.com" <xtkoba+ruby@gmail.com>
|
||
|
|
Date: Fri, 13 Aug 2021 13:45:53 +0000
|
||
|
|
Subject: [PATCH] Ignore `DW_FORM_ref_addr` [Bug #17052]
|
||
|
|
|
||
|
|
Ignore `DW_FORM_ref_addr` form and other forms that are not supposed
|
||
|
|
to be used currently.
|
||
|
|
---
|
||
|
|
addr2line.c | 23 ++++++++++++++++++++---
|
||
|
|
1 file changed, 20 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/addr2line.c b/addr2line.c
|
||
|
|
index fed1a8da84e5..92c6da5e3bea 100644
|
||
|
|
--- a/addr2line.c
|
||
|
|
+++ b/addr2line.c
|
||
|
|
@@ -1593,14 +1593,31 @@ di_read_cu(DebugInfoReader *reader)
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
-read_abstract_origin(DebugInfoReader *reader, uint64_t abstract_origin, line_info_t *line)
|
||
|
|
+read_abstract_origin(DebugInfoReader *reader, uint64_t form, uint64_t abstract_origin, line_info_t *line)
|
||
|
|
{
|
||
|
|
char *p = reader->p;
|
||
|
|
char *q = reader->q;
|
||
|
|
int level = reader->level;
|
||
|
|
DIE die;
|
||
|
|
|
||
|
|
- reader->p = reader->current_cu + abstract_origin;
|
||
|
|
+ switch (form) {
|
||
|
|
+ case DW_FORM_ref1:
|
||
|
|
+ case DW_FORM_ref2:
|
||
|
|
+ case DW_FORM_ref4:
|
||
|
|
+ case DW_FORM_ref8:
|
||
|
|
+ case DW_FORM_ref_udata:
|
||
|
|
+ reader->p = reader->current_cu + abstract_origin;
|
||
|
|
+ break;
|
||
|
|
+ case DW_FORM_ref_addr:
|
||
|
|
+ goto finish; /* not supported yet */
|
||
|
|
+ case DW_FORM_ref_sig8:
|
||
|
|
+ goto finish; /* not supported yet */
|
||
|
|
+ case DW_FORM_ref_sup4:
|
||
|
|
+ case DW_FORM_ref_sup8:
|
||
|
|
+ goto finish; /* not supported yet */
|
||
|
|
+ default:
|
||
|
|
+ goto finish;
|
||
|
|
+ }
|
||
|
|
if (!di_read_die(reader, &die)) goto finish;
|
||
|
|
|
||
|
|
/* enumerate abbrev */
|
||
|
|
@@ -1665,7 +1682,7 @@ debug_info_read(DebugInfoReader *reader, int num_traces, void **traces,
|
||
|
|
/* 1 or 3 */
|
||
|
|
break; /* goto skip_die; */
|
||
|
|
case DW_AT_abstract_origin:
|
||
|
|
- read_abstract_origin(reader, v.as.uint64, &line);
|
||
|
|
+ read_abstract_origin(reader, v.form, v.as.uint64, &line);
|
||
|
|
break; /* goto skip_die; */
|
||
|
|
}
|
||
|
|
}
|