6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-29 15:17:14 +00:00
Code Issues Projects Releases Wiki Activity

[llvm-objdump] properly use c_str() with format("%s"). Improve getLibraryShortNameByIndex() error handling.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217930 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Kledzik
2014-09-17 00:25:22 +00:00
parent 5c16c4e45a
commit 2b90611892
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Object/MachOObjectFile.cpp
View File

@@ -1184,27 +1184,22 @@ std::error_code MachOObjectFile::getLibraryShortNameByIndex(unsigned Index,
if (Index >= Libraries.size())
return object_error::parse_failed;
MachO::dylib_command D =
getStruct<MachO::dylib_command>(this, Libraries[Index]);
if (D.dylib.name >= D.cmdsize)
return object_error::parse_failed;
// If the cache of LibrariesShortNames is not built up do that first for
// all the Libraries.
if (LibrariesShortNames.size() == 0) {
for (unsigned i = 0; i < Libraries.size(); i++) {
MachO::dylib_command D =
getStruct<MachO::dylib_command>(this, Libraries[i]);
if (D.dylib.name >= D.cmdsize) {
LibrariesShortNames.push_back(StringRef());
continue;
}
if (D.dylib.name >= D.cmdsize)
return object_error::parse_failed;
const char *P = (const char *)(Libraries[i]) + D.dylib.name;
StringRef Name = StringRef(P);
if (D.dylib.name+Name.size() >= D.cmdsize)
return object_error::parse_failed;
StringRef Suffix;
bool isFramework;
StringRef shortName = guessLibraryShortName(Name, isFramework, Suffix);
if (shortName == StringRef())
if (shortName.empty())
LibrariesShortNames.push_back(Name);
else
LibrariesShortNames.push_back(shortName);