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

LanguageClient: check pointer before accessing it

Browse Source 
Add various pointerchecks in the client startup phase.

Change-Id: Ic358634f14c56f1f26c57552ca4f89cc260daa77
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2024-12-17 08:55:55 +01:00
parent c061dfad96
commit 3dea3c360b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -206,8 +206,8 @@ Client *LanguageClientManager::startClient(const BaseSettings *setting,
QTC_ASSERT(setting, return nullptr); QTC_ASSERT(setting, return nullptr);
QTC_ASSERT(setting->isValid(), return nullptr); QTC_ASSERT(setting->isValid(), return nullptr);
Client *client = setting->createClient(project); Client *client = setting->createClient(project);
qCDebug(Log) << "start client: " << client->name() << client;
QTC_ASSERT(client, return nullptr); QTC_ASSERT(client, return nullptr);
qCDebug(Log) << "start client: " << client->name() << client;
client->start(); client->start();
managerInstance->m_clientsForSetting[setting->m_id].append(client); managerInstance->m_clientsForSetting[setting->m_id].append(client);
return client; return client;
@@ -326,16 +326,22 @@ void LanguageClientManager::applySettings(BaseSettings *setting)
ensureClient(); ensureClient();
for (TextEditor::TextDocument *previousDocument : std::as_const(documents)) { for (TextEditor::TextDocument *previousDocument : std::as_const(documents)) {
if (setting->m_languageFilter.isSupported(previousDocument)) if (setting->m_languageFilter.isSupported(previousDocument)) {
openDocumentWithClient(previousDocument, ensureClient()); auto client = ensureClient();
QTC_ASSERT(client, return);
openDocumentWithClient(previousDocument, client);
}
} }
const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments(); const QList<Core::IDocument *> &openedDocuments = Core::DocumentModel::openedDocuments();
for (Core::IDocument *document : openedDocuments) { for (Core::IDocument *document : openedDocuments) {
if (documents.contains(document)) if (documents.contains(document))
continue; // already handled above continue; // already handled above
if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) { if (auto textDocument = qobject_cast<TextEditor::TextDocument *>(document)) {
if (setting->m_languageFilter.isSupported(document)) if (setting->m_languageFilter.isSupported(document)) {
ensureClient()->openDocument(textDocument); auto client = ensureClient();
QTC_ASSERT(client, return);
client->openDocument(textDocument);
}
} }
} }
} else if (setting->m_startBehavior == BaseSettings::RequiresProject) { } else if (setting->m_startBehavior == BaseSettings::RequiresProject) {