maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Tweak to r250117 and change to use ErrorOr and drop isSizeValid for 

ArchiveMemberHeader, suggestion by Rafael Espíndola.

Also The clang-x86-win2008-selfhost bot still does not like the
malformed-machos 00000031.a test, so removing it for now.  All
the other bots are fine with it however.

llvm-svn: 250222
This commit is contained in:
Kevin Enderby 2015-10-13 20:48:04 +00:00
parent a742b84e5d
commit 1c1add44b6
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/include/llvm/Object/Archive.h
View File

@ -37,8 +37,7 @@ struct ArchiveMemberHeader {
llvm::StringRef getName() const;
/// Members are not larger than 4GB.
uint32_t getSize() const;
bool isSizeValid() const;
ErrorOr<uint32_t> getSize() const;
sys::fs::perms getAccessMode() const;
sys::TimeValue getLastModified() const;

29
llvm/lib/Object/Archive.cpp
View File

@ -43,20 +43,13 @@ StringRef ArchiveMemberHeader::getName() const {
return llvm::StringRef(Name, end);
}
uint32_t ArchiveMemberHeader::getSize() const {
ErrorOr<uint32_t> ArchiveMemberHeader::getSize() const {
uint32_t Ret;
if (llvm::StringRef(Size, sizeof(Size)).rtrim(" ").getAsInteger(10, Ret))
llvm_unreachable("Size is not a decimal number.");
return object_error::parse_failed;
return Ret;
}
bool ArchiveMemberHeader::isSizeValid() const {
uint32_t Ret;
if (llvm::StringRef(Size, sizeof(Size)).rtrim(" ").getAsInteger(10, Ret))
return false;
return true;
}
sys::fs::perms ArchiveMemberHeader::getAccessMode() const {
unsigned Ret;
if (StringRef(AccessMode, sizeof(AccessMode)).rtrim(" ").getAsInteger(8, Ret))
@ -96,11 +89,6 @@ Archive::Child::Child(const Archive *Parent, const char *Start)
uint64_t Size = sizeof(ArchiveMemberHeader);
Data = StringRef(Start, Size);
// Check to make sure the size is valid.
const ArchiveMemberHeader *Header =
reinterpret_cast<const ArchiveMemberHeader *>(Data.data());
if (!Header->isSizeValid())
return;
if (!isThinMember()) {
Size += getRawSize();
Data = StringRef(Start, Size);
@ -119,13 +107,20 @@ Archive::Child::Child(const Archive *Parent, const char *Start)
}
uint64_t Archive::Child::getSize() const {
if (Parent->IsThin)
return getHeader()->getSize();
if (Parent->IsThin) {
ErrorOr<uint32_t> Size = getHeader()->getSize();
if (Size.getError())
return 0;
return Size.get();
}
return Data.size() - StartOfFile;
}
uint64_t Archive::Child::getRawSize() const {
return getHeader()->getSize();
ErrorOr<uint32_t> Size = getHeader()->getSize();
if (Size.getError())
return 0;
return Size.get();
}
bool Archive::Child::isThinMember() const {

7
llvm/test/tools/llvm-objdump/X86/malformed-machos.test
View File

@ -39,10 +39,3 @@
# RUN: | FileCheck -check-prefix=m0337 %s
# m0337: subq $16, %rsp
# RUN: llvm-objdump -arch x86_64 -macho -disassemble \
# RUN: %p/Inputs/malformed-machos/00000031.a \
# RUN: | FileCheck -check-prefix=0031a %s
# 0031a: Archive