feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: Avoid crashes when language client is invalid

Browse Source 
This can occur in situations such as clangd crashing. A similar guard is
used in the perform() function, but can still crash in cancel() or
handleSignatureResponse() if the client is destroyed beforehand.

Fixes: QTCREATORBUG-27096
Change-Id: Ib33d306c5411bc31bc13de399e6c2ad0a89462f4
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Aaron Barany
2022-05-24 15:30:20 -07:00
parent 255f7f836f
commit 449334e419
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/languageclient/languageclientfunctionhint.cpp
View File

@@ -103,6 +103,7 @@ IAssistProposal *FunctionHintProcessor::perform(const AssistInterface *interface
void FunctionHintProcessor::cancel() void FunctionHintProcessor::cancel()
{ {
QTC_ASSERT(m_client, return);
if (running()) { if (running()) {
m_client->cancelRequest(m_currentRequest.value()); m_client->cancelRequest(m_currentRequest.value());
m_client->removeAssistProcessor(this); m_client->removeAssistProcessor(this);
@@ -112,6 +113,7 @@ void FunctionHintProcessor::cancel()
void FunctionHintProcessor::handleSignatureResponse(const SignatureHelpRequest::Response &response) void FunctionHintProcessor::handleSignatureResponse(const SignatureHelpRequest::Response &response)
{ {
QTC_ASSERT(m_client, setAsyncProposalAvailable(nullptr); return);
m_currentRequest.reset(); m_currentRequest.reset();
if (auto error = response.error()) if (auto error = response.error())
m_client->log(error.value()); m_client->log(error.value());