OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[llvm-objcopy][MachO] Fix cmdsize of LC_RPATH 

Fix the calculation of the field cmdsize (in the function buildRPathLoadCommand)
to account for the null byte terminator.

Patch by Sameer Arora!

Test plan: make check-all

Differential revision: https://reviews.llvm.org/D81575
This commit is contained in:
Alexander Shaposhnikov 2020-06-11 19:55:04 -07:00
parent 526e0c8d15
commit c966ed8dc7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/test/tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test
View File

@ -21,3 +21,12 @@
# RUN: | FileCheck --check-prefix=NO-INPUT %s
# NO-INPUT: no input file specified
## Check that cmdsize accounts for NULL terminator.
# RUN: yaml2obj %p/Inputs/x86_64.yaml -o %t.x86_64
# RUN: llvm-install-name-tool -add_rpath abcd %t.x86_64
# RUN: llvm-objdump -p %t.x86_64 | FileCheck %s --check-prefix=RPATH-SIZE
# RPATH-SIZE: cmd LC_RPATH
# RPATH-SIZE-NEXT: cmdsize 24
# RPATH-SIZE-NEXT: path abcd

2
llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp
View File

@ -87,7 +87,7 @@ static LoadCommand buildRPathLoadCommand(StringRef Path) {
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());