File elfutils-0.137-readelf-crash-fix.diff of Package elfutils

Overview Repositories Revisions Requests Users Attributes Meta

File elfutils-0.137-readelf-crash-fix.diff of Package elfutils (Revision 852e089cd4506fa172d78533c9621d3e)

Currently displaying revision 852e089cd4506fa172d78533c9621d3e , Show latest

From b28a894209451b93ba830f56e40871e44e9c7c28 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Thu, 11 Dec 2008 02:09:28 -0800
Subject: [PATCH] Fixes RHBZ#465878: eu-readelf crash on empty archive

---

diff --git a/libdwfl/offline.c b/libdwfl/offline.c
index ff7b793..b3a95dd 100644
--- a/libdwfl/offline.c
+++ b/libdwfl/offline.c
@@ -1,5 +1,5 @@
 /* Recover relocatibility for addresses computed from debug information.
-   Copyright (C) 2005, 2006, 2007 Red Hat, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -259,16 +259,23 @@ process_archive (Dwfl *dwfl, const char *name, const char *file_name, int fd,
 
 {
   Dwfl_Module *mod = NULL;
+  Elf *member = elf_begin (fd, ELF_C_READ_MMAP_PRIVATE, archive);
+  if (unlikely (member == NULL)) /* Empty archive.  */
+    {
+      __libdwfl_seterrno (DWFL_E_BADELF);
+      return NULL;
+    }
+
   while (process_archive_member (dwfl, name, file_name, predicate,
-				 fd, elf_begin (fd, ELF_C_READ_MMAP_PRIVATE,
-						archive), &mod) != ELF_C_NULL)
-    ;
+				 fd, member, &mod) != ELF_C_NULL)
+    member = elf_begin (fd, ELF_C_READ_MMAP_PRIVATE, archive);
 
   /* We can drop the archive Elf handle even if we're still using members
      in live modules.  When the last module's elf_end on a member returns
      zero, that module will close FD.  If no modules survived the predicate,
      we are all done with the file right here.  */
-  if (elf_end (archive) == 0)
+  if (mod != NULL		/* If no modules, caller will clean up.  */
+      && elf_end (archive) == 0)
     close (fd);
 
   return mod;
-- 
1.6.0.5

Places

File elfutils-0.137-readelf-crash-fix.diff of Package elfutils (Revision 852e089cd4506fa172d78533c9621d3e)

Places