[binutils-gdb] Allow zero length archive elements.

[Nick Clifton <nickc at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4fc874242f8f1bf17cf6e65b159dd804e793e6cd

commit 4fc874242f8f1bf17cf6e65b159dd804e793e6cd
Author: Nick Clifton <nickc@redhat.com>
Date:   Mon Mar 7 17:29:25 2016 +0000

    Allow zero length archive elements.
    
    bfd	PR binutils/19775
    	* archive.c (bfd_generic_openr_next_archived_file): Allow zero
    	length elements in the archive.
    
    binutils PR binutils/19775
    	* testsuite/binutils-all/ar.exp (proc empty_archive): New proc.
    	Run the new proc.
    	* testsuite/binutils-all/empty: New, empty, file.

Diff:
---
 bfd/ChangeLog                          |  6 +++++
 bfd/archive.c                          |  2 +-
 binutils/ChangeLog                     |  7 ++++++
 binutils/testsuite/binutils-all/ar.exp | 40 ++++++++++++++++++++++++++++++++++
 binutils/testsuite/binutils-all/empty  |  0
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d9d9e77..8c2da68 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-07  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/19775
+	* archive.c (bfd_generic_openr_next_archived_file): Allow zero
+	length elements in the archive.
+
 2016-03-07  Jiong Wang  <jiong.wang@arm.com>
 
 	* elfnn-aarch64.c (elfNN_aarch64_check_relocs): Always create .got
diff --git a/bfd/archive.c b/bfd/archive.c
index 68c18bf..53e295e 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -802,7 +802,7 @@ bfd_generic_openr_next_archived_file (bfd *archive, bfd *last_file)
 	     Note that last_file->origin can be odd in the case of
 	     BSD-4.4-style element with a long odd size.  */
 	  filestart += filestart % 2;
-	  if (filestart <= last_file->proxy_origin)
+	  if (filestart < last_file->proxy_origin)
 	    {
 	      /* Prevent looping.  See PR19256.  */
 	      bfd_set_error (bfd_error_malformed_archive);
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7ba4aec..918299a 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-07  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/19775
+	* testsuite/binutils-all/ar.exp (proc empty_archive): New proc.
+	Run the new proc.
+	* testsuite/binutils-all/empty: New, empty, file.
+
 2016-03-04  Matthew Wahab  <matthew.wahab@arm.com>
 
 	* readelf.c (arm_attry_tag_FP_arch): Add "NEON for ARMv8.1".
diff --git a/binutils/testsuite/binutils-all/ar.exp b/binutils/testsuite/binutils-all/ar.exp
index 508ae9c..45be9b1 100644
--- a/binutils/testsuite/binutils-all/ar.exp
+++ b/binutils/testsuite/binutils-all/ar.exp
@@ -555,6 +555,45 @@ proc move_an_element { } {
     pass $testname
 }
 
+# PR 19775: Test creating and listing archives with an empty element.
+
+proc empty_archive { } {
+    global AR
+    global srcdir
+    global subdir
+
+    set testname "archive with empty element"
+
+    # FIXME: There ought to be a way to dynamically create an empty file.
+    set empty $srcdir/$subdir/empty
+    
+    if [is_remote host] {
+	set archive artest.a
+	set objfile [remote_download host $empty]
+	remote_file host delete $archive
+    } else {
+	set archive tmpdir/artest.a
+	set objfile $empty
+    }
+
+    remote_file build delete tmpdir/artest.a
+
+    set got [binutils_run $AR "-r -c $archive ${objfile}"]
+    if ![string match "" $got] {
+	fail $testname
+	return
+    }
+
+    # This commmand used to fail with: "Malformed archive".
+    set got [binutils_run $AR "-t $archive"]
+    if ![string match "empty
" $got] {
+	fail $testname
+	return
+    }
+
+    pass $testname
+}
+
 # Run the tests.
 
 # Only run the bfdtest checks if the programs exist.  Since these
@@ -574,6 +613,7 @@ argument_parsing
 deterministic_archive
 delete_an_element
 move_an_element
+empty_archive
 
 if { [is_elf_format]
      && ![istarget "*-*-hpux*"]
diff --git a/binutils/testsuite/binutils-all/empty b/binutils/testsuite/binutils-all/empty
new file mode 100644
index 0000000..e69de29