[PATCH] D138986: [AIX][BigArchive] Treat the archive is empty if the first child member offset is zero

[Kai Luo via Phabricator via llvm-commits]

lkail updated this revision to Diff 482375.

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D138986/new/

https://reviews.llvm.org/D138986

Files:
  llvm/include/llvm/Object/Archive.h
  llvm/test/Object/Inputs/aix-malformed-big-archive.a
  llvm/test/Object/archive-big-malformed-first-member.test
  llvm/test/Object/archive-big-read-empty-with-freelist.test


Index: llvm/test/Object/archive-big-read-empty-with-freelist.test
===================================================================
--- llvm/test/Object/archive-big-read-empty-with-freelist.test
+++ llvm/test/Object/archive-big-read-empty-with-freelist.test
@@ -1,3 +1,3 @@
 # Test reading an empty archive with free list in it.
-# RUN: not llvm-ar tv %p/Inputs/aix-empty-big-archive-with-freelist.a 2>&1 \
-# RUN:   | grep 'truncated or malformed archive'
+# RUN: llvm-ar tv %p/Inputs/aix-empty-big-archive-with-freelist.a 2>&1 \
+# RUN:   | not grep 'truncated or malformed archive'
Index: llvm/test/Object/archive-big-malformed-first-member.test
===================================================================
--- /dev/null
+++ llvm/test/Object/archive-big-malformed-first-member.test
@@ -0,0 +1,3 @@
+# Test reading an empty archive with first member's offset is not zero.
+# RUN: not llvm-ar tv %p/Inputs/aix-malformed-big-archive.a 2>&1 \
+# RUN:   | grep 'truncated or malformed archive'
Index: llvm/include/llvm/Object/Archive.h
===================================================================
--- llvm/include/llvm/Object/Archive.h
+++ llvm/include/llvm/Object/Archive.h
@@ -413,9 +413,7 @@
   BigArchive(MemoryBufferRef Source, Error &Err);
   uint64_t getFirstChildOffset() const override { return FirstChildOffset; }
   uint64_t getLastChildOffset() const { return LastChildOffset; }
-  bool isEmpty() const override {
-    return Data.getBufferSize() == sizeof(FixLenHdr);
-  };
+  bool isEmpty() const override { return getFirstChildOffset() == 0; }
 };
 
 } // end namespace object


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D138986.482375.patch
Type: text/x-patch
Size: 1606 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20221213/9623a703/attachment.bin>