Mark the archive header as unusable when there is no next ar element.

2 files changed, 9 insertions, 0 deletions

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index ba387557..974afa15 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-06  Mark Wielaard  <mjw@redhat.com>
+
+	* elf_next.c (elf_next): Mark the archive header as unusable when
+	there is no next ar element.
+
 2009-08-12  Mark Wielaard  <mjw@redhat.com>
 
 	* Makefile.am (libelf.so): Use -Wl,-z,defs not -defs.
diff --git a/libelf/elf_next.c b/libelf/elf_next.c
index fbfb2721..dddcb5a7 100644
--- a/libelf/elf_next.c
+++ b/libelf/elf_next.c
@@ -84,6 +84,10 @@ elf_next (elf)
   /* Get the next archive header.  */
   ret = __libelf_next_arhdr_wrlock (parent) != 0 ? ELF_C_NULL : elf->cmd;
 
+  /* If necessary, mark the archive header as unusable.  */
+  if (ret == ELF_C_NULL)
+      parent->state.ar.elf_ar_hdr.ar_name = NULL;
+
   rwlock_unlock (parent->lock);
 
   return ret;