summaryrefslogtreecommitdiff
path: root/libbacktrace
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-25 22:36:11 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-25 22:36:11 +0000
commitc4e0613eb427e516f1b6c1b919e68be64a9015fd (patch)
treea3800df00dc292230cbe85bb6e552ce5651a299d /libbacktrace
parentab27031294979ae938797267db4a519af41804a1 (diff)
downloadgcc-c4e0613eb427e516f1b6c1b919e68be64a9015fd.tar.gz
PR other/56076
* dwarf.c (read_line_header): Don't crash if DW_AT_comp_dir attribute was not seen. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195478 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/ChangeLog6
-rw-r--r--libbacktrace/dwarf.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 25a56d92e22..b8755cfb60b 100644
--- a/libbacktrace/ChangeLog
+++ b/libbacktrace/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-25 Jakub Jelinek <jakub@redhat.com>
+
+ PR other/56076
+ * dwarf.c (read_line_header): Don't crash if DW_AT_comp_dir
+ attribute was not seen.
+
2013-01-16 Ian Lance Taylor <iant@google.com>
* dwarf.c (struct unit): Add filename and abs_filename fields.
diff --git a/libbacktrace/dwarf.c b/libbacktrace/dwarf.c
index ce12bdc48a3..3cdbb428b6e 100644
--- a/libbacktrace/dwarf.c
+++ b/libbacktrace/dwarf.c
@@ -1655,7 +1655,8 @@ read_line_header (struct backtrace_state *state, struct unit *u,
strnlen ((const char *) hdr_buf.buf, hdr_buf.left) + 1))
return 0;
dir_index = read_uleb128 (&hdr_buf);
- if (IS_ABSOLUTE_PATH (filename))
+ if (IS_ABSOLUTE_PATH (filename)
+ || (dir_index == 0 && u->comp_dir == NULL))
hdr->filenames[i] = filename;
else
{