[PATCH] debugedit: Skip relocations with missing symbol/section offset.

[Mark Wielaard]

We tried to handle relocations that didn't have a symbol associated
with any section.  The would cause a message like: "Unhandled
relocation 1 in .debug_info section".  Which wasn't that helpful
either. So skip relocations without an associated symbol section index
and improve the error message a little.

    * debugedit.c (setup_relbuf): Continue when sym.st_shndx == 0.
    Add relocation index to error message.

Signed-off-by: Mark Wielaard <mark@klomp.org>
---
 tools/debugedit.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/debugedit.c b/tools/debugedit.c
index c6975b2..d0c6371 100644
--- a/tools/debugedit.c
+++ b/tools/debugedit.c
@@ -561,10 +561,11 @@ setup_relbuf (DSO *dso, debug_section *sec, int *reltype)
 	continue;
       /* Only consider relocations against .debug_str, .debug_line,
 	 .debug_line_str, and .debug_abbrev.  */
-      if (sym.st_shndx != debug_sections[DEBUG_STR].sec
-	  && sym.st_shndx != debug_sections[DEBUG_LINE].sec
-	  && sym.st_shndx != debug_sections[DEBUG_LINE_STR].sec
-	  && sym.st_shndx != debug_sections[DEBUG_ABBREV].sec)
+      if (sym.st_shndx == 0 ||
+	  (sym.st_shndx != debug_sections[DEBUG_STR].sec
+	   && sym.st_shndx != debug_sections[DEBUG_LINE].sec
+	   && sym.st_shndx != debug_sections[DEBUG_LINE_STR].sec
+	   && sym.st_shndx != debug_sections[DEBUG_ABBREV].sec))
 	continue;
       rela.r_addend += sym.st_value;
       rtype = ELF64_R_TYPE (rela.r_info);
@@ -625,8 +626,8 @@ setup_relbuf (DSO *dso, debug_section *sec, int *reltype)
 #endif
 	default:
 	fail:
-	  error (1, 0, "%s: Unhandled relocation %d in %s section",
-		 dso->filename, rtype, sec->name);
+	  error (1, 0, "%s: Unhandled relocation %d at [%d] for %s section",
+		 dso->filename, rtype, ndx, sec->name);
 	}
       relend->ptr = sec->data
 	+ (rela.r_offset - base);
-- 
2.32.0