strnlen isn't available on some platforms, use StringRef instead

llvm-svn: 224679
2014-12-20 08:24:43 +00:00 · 2014-12-20 08:24:43 +00:00 · d4449ed0f2
parent 35545fa20a
commit d4449ed0f2
1 changed files with 2 additions and 1 deletions
--- 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;
    }