commit 5e102c6c48f2cdfe1741f60805c830fb1e17fa47
author Rafael Espindola <rafael.espindola@gmail.com> Fri Jul 12 13:32:28 2013 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Fri Jul 12 13:32:28 2013 +0000
tree 586f46dbe994c900e7e6cd49d302197a66198397
parent 7ffc422659e29061511b9ae5f6fdda2458a76b50

Don't reject an empty archive.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186159 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Object/Archive.cpp

diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index 60c6d21..7579a9a 100644
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -212,9 +212,9 @@
 Archive::Archive(MemoryBuffer *source, error_code &ec)
   : Binary(Binary::ID_Archive, source), SymbolTable(end_children()) {
   // Check for sufficient magic.
-  if (!source || source->getBufferSize()
-                 < (8 + sizeof(ArchiveMemberHeader)) // Smallest archive.
-              || StringRef(source->getBufferStart(), 8) != Magic) {
+  assert(source);
+  if (source->getBufferSize() < 8 ||
+      StringRef(source->getBufferStart(), 8) != Magic) {
     ec = object_error::invalid_file_type;
     return;
   }
@@ -224,7 +224,7 @@
   child_iterator e = end_children();
 
   if (i == e) {
-    ec = object_error::parse_failed;
+    ec = object_error::success;
     return;
   }
 
@@ -314,6 +314,8 @@
 }
 
 Archive::child_iterator Archive::begin_children(bool skip_internal) const {
+  if (Data->getBufferSize() == 8) // empty archive.
+    return end_children();
   const char *Loc = Data->getBufferStart() + strlen(Magic);
   Child c(this, Loc);
   // Skip internals at the beginning of an archive.