From c3aa57416566c97888abbc5c2ef4631c8c9e16f0 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 12 Feb 2016 23:59:32 +0100 Subject: Fix GCC6 -Wnull-dereference warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit asm_begin.c: In function ‘asm_begin’: asm_begin.c:62:7: error: potential null pointer dereference [-Werror=null-dereference] __fsetlocking (result->out.file, FSETLOCKING_BYCALLER); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ We set result to NULL just before this call in case of error. Fixed by only calling __fsetlocking when result is not NULL. strip.c: In function ‘handle_elf.constprop’: strip.c:1270:31: error: null pointer dereference [-Werror=null-dereference] elf_assert ((versiondata->d_size / sizeof (Elf32_Word)) ~~~~~~~~~~~^~~ src/strip.c:597:37: note: in definition of macro ‘elf_assert’ #define elf_assert(test) do { if (!(test)) goto illformed; } while (0) ^~~~ That is the wrong check, we want to check shndxdata, not versiondata here. Signed-off-by: Mark Wielaard --- src/strip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/strip.c') diff --git a/src/strip.c b/src/strip.c index 06d7cfd8..a6042445 100644 --- a/src/strip.c +++ b/src/strip.c @@ -1267,8 +1267,10 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname, shndxdata = elf_getdata (shdr_info[shdr_info[cnt].symtab_idx].scn, NULL); - elf_assert ((versiondata->d_size / sizeof (Elf32_Word)) - >= shdr_info[cnt].data->d_size / elsize); + elf_assert (shndxdata != NULL + && shndxdata->d_buf != NULL + && ((shndxdata->d_size / sizeof (Elf32_Word)) + >= shdr_info[cnt].data->d_size / elsize)); } if (shdr_info[cnt].version_idx != 0) -- cgit v1.2.3