Merge fix for use-after-free in clang 3.9. Close #637. Close #630.

Unregister ourselves as a DiagnosticsConsumer before we are destroyed.
mozilla · Feb 9, 2017 · 6036f54 · 6036f54
2 parents debc4e4 + 68f1182
commit 6036f54
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/dxr/plugins/clang/dxr-index.cpp b/dxr/plugins/clang/dxr-index.cpp
@@ -207,6 +207,14 @@ class IndexConsumer : public ASTConsumer,
     printPolicy.SuppressTagKeyword = true;
   }
 
+  ~IndexConsumer() {
+#if CLANG_AT_LEAST(3, 6)
+    ci.getDiagnostics().setClient(inner.release());
+#else
+    ci.getDiagnostics().setClient(inner);
+#endif
+  }
+
 #if CLANG_AT_LEAST(3, 3)
   // `clone` was removed from the DiagnosticConsumer interface in version 3.3,
   // so this can all be deleted once we're no longer supporting 3.2.