commit 4d3d82eef96e10a54e3d0bf367d8e10917ca8662
author Ilya Biryukov <ibiryukov@google.com> Mon Nov 26 15:52:16 2018 +0000
committer Ilya Biryukov <ibiryukov@google.com> Mon Nov 26 15:52:16 2018 +0000
tree 0c280523176deb7f50d79963c74dab133efb4bcc
parent 647da3e8a5ada3d51b9ca09052c1876f08f4eb0a

[clangd] Fix use-after-free with expected types in indexing

llvm-svn: 347563

clang-tools-extra/clangd/index/SymbolCollector.cpp

diff --git a/clang-tools-extra/clangd/index/SymbolCollector.cpp b/clang-tools-extra/clangd/index/SymbolCollector.cpp
index 84aff8b..52a2069 100644
--- a/clang-tools-extra/clangd/index/SymbolCollector.cpp
+++ b/clang-tools-extra/clangd/index/SymbolCollector.cpp
@@ -587,9 +587,11 @@
   if (!Include.empty())
     S.IncludeHeaders.emplace_back(Include, 1);
 
+  llvm::Optional<OpaqueType> TypeStorage;
   if (S.Flags & Symbol::IndexedForCodeCompletion) {
-    if (auto T = OpaqueType::fromCompletionResult(*ASTCtx, SymbolCompletion))
-      S.Type = T->raw();
+    TypeStorage = OpaqueType::fromCompletionResult(*ASTCtx, SymbolCompletion);
+    if (TypeStorage)
+      S.Type = TypeStorage->raw();
   }
 
   S.Origin = Opts.Origin;