re PR other/56076 (Several 64-bit libgo tests FAIL in read_line_header)

	PR other/56076
	* dwarf.c (read_line_header): Don't crash if DW_AT_comp_dir
	attribute was not seen.

From-SVN: r195478

diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
index 25a56d92e22995b9d383e657b1f7cb2e7c148667..b8755cfb60b73983c1ec502038e552897c01b342 100644 (file)
--- 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 ce12bdc48a33a881babc00210db8305ebb8916c6..3cdbb428b6eef0d73a46c9952ab50c201f442e32 100644 (file)
--- 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
        {