From: Mark Wielaard <mjw@redhat.com>
Date: Thu, 18 Dec 2014 08:28:50 +0000 (+0100)
Subject: libdwfl: Make sure symstrdata->d_buf != NULL in relocate resolve_symbol.
X-Git-Tag: elfutils-0.161~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b290f47f2cb15152140354c2850ed4a15449d2df;p=thirdparty%2Felfutils.git

libdwfl: Make sure symstrdata->d_buf != NULL in relocate resolve_symbol.

Signed-off-by: Mark Wielaard <mjw@redhat.com>
---

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 36585765c..f6db301c3 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-18  Mark Wielaard  <mjw@redhat.com>
+
+	* relocate.c (resolve_symbol): Make sure symstrdata->d_buf != NULL.
+
 2014-12-13  Mark Wielaard  <mjw@redhat.com>
 
 	* dwfl_module_getdwarf.c (find_dynsym): elf_getdata_rawchunk takes
diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c
index fd7dbd54a..e102e1e42 100644
--- a/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@ -206,7 +206,8 @@ resolve_symbol (Dwfl_Module *referer, struct reloc_symtab_cache *symtab,
 	  symtab->symstrdata = elf_getdata (elf_getscn (symtab->symelf,
 							symtab->strtabndx),
 					    NULL);
-	  if (unlikely (symtab->symstrdata == NULL))
+	  if (unlikely (symtab->symstrdata == NULL
+			|| symtab->symstrdata->d_buf == NULL))
 	    return DWFL_E_LIBELF;
 	}
       if (unlikely (sym->st_name >= symtab->symstrdata->d_size))