summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-objdump/MachODump.cpp
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
commitd4449ed0f2eae9bd9fac3a1ad6722db70d916715 (patch)
treeffc480190bf69c2df126df2e43d02b1964d707a2 /llvm/tools/llvm-objdump/MachODump.cpp
parent35545fa20aa62e1a665d2a958b08a356284f79fe (diff)
downloadbcm5719-llvm-d4449ed0f2eae9bd9fac3a1ad6722db70d916715.tar.gz
bcm5719-llvm-d4449ed0f2eae9bd9fac3a1ad6722db70d916715.zip
strnlen isn't available on some platforms, use StringRef instead
llvm-svn: 224679
Diffstat (limited to 'llvm/tools/llvm-objdump/MachODump.cpp')
-rw-r--r--llvm/tools/llvm-objdump/MachODump.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp
index 9f5216bffae..75ad4aa8b9b 100644
--- a/llvm/tools/llvm-objdump/MachODump.cpp
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud