From: Mark Wielaard <mark@klomp.org>
Date: Tue, 20 Mar 2018 12:29:25 +0000 (+0100)
Subject: readelf: Report error when decl_file or call_file attribute is invalid.
X-Git-Tag: elfutils-0.171~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cda00f3bf57c18783971bd1d423d2fa0c478f95c;p=thirdparty%2Felfutils.git

readelf: Report error when decl_file or call_file attribute is invalid.

Report an error for why the DW_AT_decl_file or DW_AT_call_file cannot
be resolved to a file name. This is likely invalid DWARF, a missing
DW_AT_stmt_list attribute on the CU or a missing .debug_line section.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c879712d5..f2f99ed1a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-20  Mark Wielaard  <mark@klomp.org>
+
+	* readelf.c (attr_callback): Report error when DW_AT_decl_file or
+	DW_AT_call_file cannot be resolved.
+
 2018-03-06  Mark Wielaard  <mark@klomp.org>
 
 	* readelf.c (print_ops): Handle DW_OP_addrx, DW_OP_constx,
diff --git a/src/readelf.c b/src/readelf.c
index fcf5e2cd9..8a968815b 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -6247,11 +6247,25 @@ attr_callback (Dwarf_Attribute *attrp, void *arg)
 		if (dwarf_getsrcfiles (&cudie, &files, &nfiles) == 0)
 		  {
 		    valuestr = dwarf_filesrc (files, num, NULL, NULL);
-		    char *filename = strrchr (valuestr, '/');
-		    if (filename != NULL)
-		      valuestr = filename + 1;
+		    if (valuestr != NULL)
+		      {
+			char *filename = strrchr (valuestr, '/');
+			if (filename != NULL)
+			  valuestr = filename + 1;
+		      }
+		    else
+		      error (0, 0, gettext ("invalid file (%" PRId64 "): %s"),
+			     num, dwarf_errmsg (-1));
 		  }
+		else
+		  error (0, 0, gettext ("no srcfiles for CU [%zx]"),
+			 dwarf_dieoffset (&cudie));
 	      }
+	    else
+	     error (0, 0, gettext ("couldn't get DWARF CU: %s"),
+		    dwarf_errmsg (-1));
+	    if (valuestr == NULL)
+	      valuestr = "???";
 	  }
 	  break;
 	default: