6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

[Object] Fix MachO's getUuid to return a pointer into the object instead of a dangling ArrayRef.

Browse Source 
This works because uuid's are always little endian so it's not swapped.
Fixes use-after-return reported by asan.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220567 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benjamin Kramer 2014-10-24 15:52:05 +00:00
parent a653bf1b12
commit 5ea04462dc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Object/MachOObjectFile.cpp
View File

@ -2460,8 +2460,9 @@ ArrayRef<uint8_t> MachOObjectFile::getDyldInfoExportsTrie() const {
ArrayRef<uint8_t> MachOObjectFile::getUuid() const { ArrayRef<uint8_t> MachOObjectFile::getUuid() const {
if (!UuidLoadCmd) if (!UuidLoadCmd)
return ArrayRef<uint8_t>(); return ArrayRef<uint8_t>();
MachO::uuid_command Uuid = getStruct<MachO::uuid_command>(this, UuidLoadCmd); // Returning a pointer is fine as uuid doesn't need endian swapping.
return ArrayRef<uint8_t>(Uuid.uuid, 16); const char *Ptr = UuidLoadCmd + offsetof(MachO::uuid_command, uuid);
return ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(Ptr), 16);
} }
StringRef MachOObjectFile::getStringTableData() const { StringRef MachOObjectFile::getStringTableData() const {