Skip to content

Commit

Permalink
Fix a bug in llvm-obdump(1) with the -macho and -info-plist options
Browse files Browse the repository at this point in the history
which caused it to print more than the (__TEXT,__info_plist) if that
section did not end with a null.

rdar://27378808


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294236 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
enderby committed Feb 6, 2017
1 parent 5681e38 commit 94dcd1b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions test/tools/llvm-objdump/X86/macho-info-plist-nofollow.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# RUN: llvm-mc < %s -triple x86_64-apple-darwin -filetype=obj | llvm-objdump -m -info-plist - | FileCheck %s

.section __TEXT, __info_plist
.ascii "This is the (__TEXT,__info_plist) section\n"
.section __TEXT, __follow
.asciz "This is the (__TEXT,__follow) section\n"

# CHECK: Contents of (__TEXT,__info_plist) section
# CHECK: This is the (__TEXT,__info_plist) section
# CHECK-NOT: This is the (__TEXT,__follow) section
2 changes: 1 addition & 1 deletion tools/llvm-objdump/MachODump.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ static void DumpInfoPlistSectionContents(StringRef Filename,
StringRef BytesStr;
Section.getContents(BytesStr);
const char *sect = reinterpret_cast<const char *>(BytesStr.data());
outs() << sect;
outs() << format("%.*s", BytesStr.size(), sect) << "\n";
return;
}
}
Expand Down

0 comments on commit 94dcd1b

Please sign in to comment.