[PATCH] D69126: [Object] Fix the return type of getOffset/getSize

[Alexander Shaposhnikov via Phabricator via llvm-commits]

alexshap created this revision.
alexshap added reviewers: mtrent, smeenai, compnerd.
Herald added a project: LLVM.

Header64.offset/Header64.size are uint64_t, thus we should no truncate them to unit32_t.
Moreover, there are a number of places where we sum the offset and the size (e.g. in various checks in MachOUniversal.cpp),
the truncation  causes issues since the offset/size can perfectly fit into uint32_t, while the sum overflows.


Repository:
  rL LLVM

https://reviews.llvm.org/D69126

Files:
  include/llvm/Object/MachOUniversal.h


Index: include/llvm/Object/MachOUniversal.h
===================================================================
--- include/llvm/Object/MachOUniversal.h
+++ include/llvm/Object/MachOUniversal.h
@@ -66,13 +66,13 @@
       else // Parent->getMagic() == MachO::FAT_MAGIC_64
         return Header64.cpusubtype;
     }
-    uint32_t getOffset() const {
+    uint64_t getOffset() const {
       if (Parent->getMagic() == MachO::FAT_MAGIC)
         return Header.offset;
       else // Parent->getMagic() == MachO::FAT_MAGIC_64
         return Header64.offset;
     }
-    uint32_t getSize() const {
+    uint64_t getSize() const {
       if (Parent->getMagic() == MachO::FAT_MAGIC)
         return Header.size;
       else // Parent->getMagic() == MachO::FAT_MAGIC_64


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69126.225481.patch
Type: text/x-patch
Size: 763 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191017/b89bd74b/attachment.bin>