Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Object] Fix handling of large archive members
The archive library truncated the size of archive members whose size was greater than max uint32_t. This patch fixes the issue and adds some unit tests to verify. Reviewed by: ruiu, MaskRay, grimar, rupprecht Differential Revision: https://reviews.llvm.org/D75742
- Loading branch information
Showing
3 changed files
with
85 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
//===- ArchiveTest.cpp ----------------------------------------------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include "llvm/Object/Archive.h" | ||
#include "llvm/Testing/Support/Error.h" | ||
#include "gtest/gtest.h" | ||
|
||
using namespace llvm; | ||
using namespace object; | ||
using namespace testing; | ||
|
||
static const char ArchiveWithMember[] = "!<arch>\n" // Global header | ||
"test/ " // Member name | ||
"0 " // Timestamp | ||
"0 " // Owner ID | ||
"0 " // Group ID | ||
"0 " // File mode | ||
"9999999999" // Size | ||
"`\n"; | ||
|
||
static const char ThinArchiveWithMember[] = "!<thin>\n" // Global header | ||
"test/ " // Member name | ||
"0 " // Timestamp | ||
"0 " // Owner ID | ||
"0 " // Group ID | ||
"0 " // File mode | ||
"9999999999" // Size | ||
"`\n"; | ||
|
||
struct ArchiveTestsFixture : Test { | ||
Expected<Archive::child_iterator> createChild(StringRef Src) { | ||
MemoryBufferRef Source(Src, "archive"); | ||
Expected<std::unique_ptr<Archive>> AOrErr = Archive::create(Source); | ||
if (!AOrErr) | ||
return AOrErr.takeError(); | ||
A = std::move(*AOrErr); | ||
|
||
Error ChildErr = Error::success(); | ||
auto Child = A->child_begin(ChildErr); | ||
if (ChildErr) | ||
return std::move(ChildErr); | ||
return Child; | ||
} | ||
|
||
std::unique_ptr<Archive> A; | ||
}; | ||
|
||
TEST_F(ArchiveTestsFixture, ArchiveChildGetSizeRegularArchive) { | ||
auto Child = createChild(ArchiveWithMember); | ||
ASSERT_THAT_EXPECTED(Child, Succeeded()); | ||
|
||
Expected<uint64_t> Size = (*Child)->getSize(); | ||
ASSERT_THAT_EXPECTED(Size, Succeeded()); | ||
EXPECT_EQ(9999999999, *Size); | ||
} | ||
|
||
TEST_F(ArchiveTestsFixture, ArchiveChildGetSizeThinArchive) { | ||
auto Child = createChild(ThinArchiveWithMember); | ||
ASSERT_THAT_EXPECTED(Child, Succeeded()); | ||
|
||
Expected<uint64_t> Size = (*Child)->getSize(); | ||
ASSERT_THAT_EXPECTED(Size, Succeeded()); | ||
EXPECT_EQ(9999999999, *Size); | ||
} | ||
|
||
TEST_F(ArchiveTestsFixture, ArchiveChildGetBuffer) { | ||
auto Child = createChild(ArchiveWithMember); | ||
ASSERT_THAT_EXPECTED(Child, Succeeded()); | ||
|
||
Expected<StringRef> Buffer = (*Child)->getBuffer(); | ||
// Cannot use ASSERT_THAT_EXPECTED, as that will attempt to print the | ||
// StringRef (which has an invalid size). | ||
ASSERT_TRUE((bool)Buffer); | ||
EXPECT_EQ(9999999999, Buffer->size()); | ||
EXPECT_EQ(ArchiveWithMember + sizeof(ArchiveWithMember) - 1, Buffer->data()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters