[PATCH] D81575: [llvm-objcopy] Fix RPathLC.cmdsize

[Sameer Arora via Phabricator via llvm-commits]

sameerarora101 created this revision.
sameerarora101 added reviewers: alexshap, jhenderson, smeenai, Ktwu.
Herald added subscribers: llvm-commits, abrachet, MaskRay.
Herald added a reviewer: rupprecht.
Herald added a project: LLVM.

Add 1 to the `cmdsize` field under `buildRPathLoadCommand` in
`MachOObjcopy.cpp`. The issue is highlighted in comments under
https://reviews.llvm.org/D81527.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D81575

Files:
  llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp


Index: llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
===================================================================
--- llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
+++ llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
@@ -87,7 +87,7 @@
   MachO::rpath_command RPathLC;
   RPathLC.cmd = MachO::LC_RPATH;
   RPathLC.path = sizeof(MachO::rpath_command);
-  RPathLC.cmdsize = alignTo(sizeof(MachO::rpath_command) + Path.size(), 8);
+  RPathLC.cmdsize = alignTo(sizeof(MachO::rpath_command) + Path.size() + 1, 8);
   LC.MachOLoadCommand.rpath_command_data = RPathLC;
   LC.Payload.assign(RPathLC.cmdsize - sizeof(MachO::rpath_command), 0);
   std::copy(Path.begin(), Path.end(), LC.Payload.begin());


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D81575.269851.patch
Type: text/x-patch
Size: 701 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200610/4d0b17be/attachment.bin>