diff options
| -rw-r--r-- | lib/Object/Archive.cpp | 2 | ||||
| -rw-r--r-- | test/Object/Inputs/archive-test.a-gnu-minimal | 2 | ||||
| -rw-r--r-- | test/Object/nm-archive.test | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp index 8206b0a18b..0b819f4c80 100644 --- a/lib/Object/Archive.cpp +++ b/lib/Object/Archive.cpp @@ -104,7 +104,7 @@ Archive::Archive(MemoryBuffer *source, error_code &ec) : Binary(Binary::ID_Archive, source) { // Check for sufficient magic. if (!source || source->getBufferSize() - < (8 + sizeof(ArchiveMemberHeader) + 2) // Smallest archive. + < (8 + sizeof(ArchiveMemberHeader)) // Smallest archive. || StringRef(source->getBufferStart(), 8) != Magic) { ec = object_error::invalid_file_type; return; diff --git a/test/Object/Inputs/archive-test.a-gnu-minimal b/test/Object/Inputs/archive-test.a-gnu-minimal new file mode 100644 index 0000000000..a243273c48 --- /dev/null +++ b/test/Object/Inputs/archive-test.a-gnu-minimal @@ -0,0 +1,2 @@ +!<arch> +test/ 1372964340 1000 1000 100664 0 ` diff --git a/test/Object/nm-archive.test b/test/Object/nm-archive.test index 869bea849c..922983c887 100644 --- a/test/Object/nm-archive.test +++ b/test/Object/nm-archive.test @@ -9,6 +9,9 @@ RUN: llvm-nm %t2 | FileCheck %s -check-prefix BITCODE Test we don't error with an archive with no symtab. RUN: llvm-nm %p/Inputs/archive-test.a-gnu-no-symtab +Or in an archive with no symtab or string table. +RUN: llvm-nm %p/Inputs/archive-test.a-gnu-minimal + COFF: trivial-object-test.coff-i386: COFF-NEXT: 00000000 d .data COFF-NEXT: 00000000 t .text |