summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-12-20 08:24:43 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-12-20 08:24:43 +0000
commit992d4bb278573449b29007175358fd82938a0ca8 (patch)
treec90fd50b4c4352bbd10abaa249cbe396b0ca0c01 /tools
parentae39073d9917874d00c4f1a863b6f9c94679d144 (diff)
strnlen isn't available on some platforms, use StringRef instead
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224679 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/llvm-objdump/MachODump.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/llvm-objdump/MachODump.cpp b/tools/llvm-objdump/MachODump.cpp
index 9f5216bffae..75ad4aa8b9b 100644
--- 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;
}