From c966ed8dc7ce7629c4371314e5ec2119b84e852c Mon Sep 17 00:00:00 2001 From: Alexander Shaposhnikov Date: Thu, 11 Jun 2020 19:55:04 -0700 Subject: [PATCH] [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 --- .../tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test | 9 +++++++++ llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test b/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test index 61aca20..1435c6b 100644 --- a/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test +++ b/llvm/test/tools/llvm-objcopy/MachO/install-name-tool-add-rpath.test @@ -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 diff --git a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp index d6889c1..17d84549 100644 --- a/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp +++ b/llvm/tools/llvm-objcopy/MachO/MachOObjcopy.cpp @@ -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()); -- 2.7.4