projects
/
oota-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ae39073
)
strnlen isn't available on some platforms, use StringRef instead
author
David Majnemer
<david.majnemer@gmail.com>
Sat, 20 Dec 2014 08:24:43 +0000
(08:24 +0000)
committer
David Majnemer
<david.majnemer@gmail.com>
Sat, 20 Dec 2014 08:24:43 +0000
(08:24 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224679
91177308
-0d34-0410-b5e6-
96231b3b80d8
tools/llvm-objdump/MachODump.cpp
patch
|
blob
|
history
diff --git
a/tools/llvm-objdump/MachODump.cpp
b/tools/llvm-objdump/MachODump.cpp
index
9f5216b
..
75ad4aa
100644
(file)
--- a/
tools/llvm-objdump/MachODump.cpp
+++ b/
tools/llvm-objdump/MachODump.cpp
@@
-3664,7
+3664,8
@@
static void PrintLinkerOptionCommand(MachO::linker_option_command lo,
if (left > 0) {
i++;
outs() << " string #" << i << " " << format("%.*s\n", left, string);
- uint32_t len = strnlen(string, left) + 1;
+ uint32_t NullPos = StringRef(string, left).find('\0');
+ uint32_t len = std::min(NullPos, left) + 1;
string += len;
left -= len;
}