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

LanguageClient: Fix possible nullptr access

Browse Source 
Fixes: QTCREATORBUG-25528
Change-Id: I23d50b8bb0a3112eab3eac6a9300e2783b8bb939
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-04-21 11:28:39 +02:00
parent aaa5b93b2e
commit 44a33d4c2c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,12 @@ void FunctionHintProcessor::handleSignatureResponse(const SignatureHelpRequest::
if (auto error = response.error()) if (auto error = response.error())
m_client->log(error.value()); m_client->log(error.value());
m_client->removeAssistProcessor(this); m_client->removeAssistProcessor(this);
const SignatureHelp &signatureHelp = response.result().value().value(); auto result = response.result().value_or(LanguageClientValue<SignatureHelp>());
if (result.isNull()) {
setAsyncProposalAvailable(nullptr);
return;
}
const SignatureHelp &signatureHelp = result.value();
if (signatureHelp.signatures().isEmpty()) { if (signatureHelp.signatures().isEmpty()) {
setAsyncProposalAvailable(nullptr); setAsyncProposalAvailable(nullptr);
} else { } else {