Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-07 08:44:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix invalid handling of llvm MemoryBuffer in DiagnosticMain.

Browse Source 
When 'Buf' is passed to clang in addRemappedFile then clang will destroy it when the compiler instance is destroyed.
So release ownership of the pointer immediately.
Otherwise if the call to Parse fails then we destroy both the compiler instance (indirectly destroying the MemoryBuffer) and destroy the memory buffer again via the reference to it from 'Buf' which isn't cleared yet.
This can cause a segmentation fault.
This commit is contained in:
dw 2019-03-29 11:30:19 +00:00
parent 1976fec595
commit c354600c6e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sema_manager.cc
View File

@ -300,11 +300,11 @@ std::unique_ptr<CompilerInstance> BuildCompilerInstance(
Session &session, std::unique_ptr<CompilerInvocation> CI,
IntrusiveRefCntPtr<llvm::vfs::FileSystem> FS, DiagnosticConsumer &DC,
const PreambleData *preamble, const std::string &main,
std::unique_ptr<llvm::MemoryBuffer> &Buf) {
std::unique_ptr<llvm::MemoryBuffer> Buf) {
if (preamble)
preamble->Preamble.OverridePreamble(*CI, FS, Buf.get());
preamble->Preamble.OverridePreamble(*CI, FS, Buf.release());
else
CI->getPreprocessorOpts().addRemappedFile(main, Buf.get());
CI->getPreprocessorOpts().addRemappedFile(main, Buf.release());
auto Clang = std::make_unique<CompilerInstance>(session.PCH);
Clang->setInvocation(std::move(CI));
@ -485,7 +485,7 @@ void *CompletionMain(void *manager_) {
continue;
}
auto Clang = BuildCompilerInstance(*session, std::move(CI), FS, DC,
preamble.get(), task->path, Buf);
preamble.get(), task->path, std::move(Buf));
if (!Clang)
continue;
@ -493,7 +493,6 @@ void *CompletionMain(void *manager_) {
Clang->setCodeCompletionConsumer(task->Consumer.release());
if (!Parse(*Clang))
continue;
Buf.release();
task->on_complete(&Clang->getCodeCompletionConsumer());
}
@ -578,12 +577,11 @@ void *DiagnosticMain(void *manager_) {
std::string content = manager->wfiles->GetContent(task.path);
auto Buf = llvm::MemoryBuffer::getMemBuffer(content);
auto Clang = BuildCompilerInstance(*session, std::move(CI), FS, DC,
preamble.get(), task.path, Buf);
preamble.get(), task.path, std::move(Buf));
if (!Clang)
continue;
if (!Parse(*Clang))
continue;
Buf.release();
auto Fill = [](const DiagBase &d, Diagnostic &ret) {
ret.range = lsRange{{d.range.start.line, d.range.start.column},