1 files changed, 11 insertions, 7 deletions
diff --git a/clang/lib/Sema/SemaChecking.cpp b/clang/lib/Sema/SemaChecking.cpp
index 0da06a99d59..1e26c3507bb 100644
--- a/clang/lib/Sema/SemaChecking.cpp
+++ b/clang/lib/Sema/SemaChecking.cpp
@@ -447,13 +447,17 @@ bool Sema::CheckObjCString(Expr *Arg) {
     return true;
   }
 
-  llvm::StringRef Str = Literal->getString();
-  size_t NullLoc = Str.find('\0');
-
-  if (NullLoc != llvm::StringRef::npos)
-    Diag(getLocationOfStringLiteralByte(Literal, NullLoc),
-         diag::warn_cfstring_literal_contains_nul_character)
-      << Arg->getSourceRange();
+  const char *Data = Literal->getStrData();
+  unsigned Length = Literal->getByteLength();
+
+  for (unsigned i = 0; i < Length; ++i) {
+    if (!Data[i]) {
+      Diag(getLocationOfStringLiteralByte(Literal, i),
+           diag::warn_cfstring_literal_contains_nul_character)
+        << Arg->getSourceRange();
+      break;
+    }
+  }
 
   return false;
 }