From 4c8767fa55d6c2158cbf88738d6d234031865a89 Mon Sep 17 00:00:00 2001
From: Eric Liu <ioeric@google.com>
Date: Fri, 24 Feb 2017 12:56:51 +0000
Subject: [change-namespace] fix asan failure in r296110.

llvm-svn: 296113
---
 .../change-namespace/tool/ClangChangeNamespace.cpp      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'clang-tools-extra/change-namespace')

diff --git a/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp b/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
index 02a97839f15..6a17f192776 100644
--- a/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
+++ b/clang-tools-extra/change-namespace/tool/ClangChangeNamespace.cpp
@@ -80,15 +80,16 @@ cl::opt<std::string> WhiteListFile(
     cl::init(""), cl::cat(ChangeNamespaceCategory));
 
 llvm::ErrorOr<std::vector<std::string>> GetWhiteListedSymbolPatterns() {
+  if (WhiteListFile.empty())
+    return std::vector<std::string>();
+
   llvm::SmallVector<StringRef, 8> Lines;
-  if (!WhiteListFile.empty()) {
-    llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
-        llvm::MemoryBuffer::getFile(WhiteListFile);
-    if (!File)
-      return File.getError();
-    llvm::StringRef Content = File.get()->getBuffer();
-    Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
-  }
+  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> File =
+      llvm::MemoryBuffer::getFile(WhiteListFile);
+  if (!File)
+    return File.getError();
+  llvm::StringRef Content = File.get()->getBuffer();
+  Content.split(Lines, '\n', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
   return std::vector<std::string>(Lines.begin(), Lines.end());
 }
 
-- 
cgit v1.2.1