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

ResourceEditor: Fix nullptr access

Browse Source 
Do not crash when the caller of open or save doesn't care about error
messages.

Task-number: QTCREATORBUG-31593
Change-Id: Idef073ef3d676d276b412c9134a260b1171260ec
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2024-09-18 16:09:16 +02:00
parent 835a2c710a
commit d51aae9ad1
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/resourceeditor/resourceeditor.cpp
View File

@@ -193,7 +193,8 @@ IDocument::OpenResult ResourceEditorDocument::open(QString *errorString,
OpenResult openResult = m_model.reload(); OpenResult openResult = m_model.reload();
if (openResult != OpenResult::Success) { if (openResult != OpenResult::Success) {
*errorString = m_model.errorMessage(); if (errorString)
*errorString = m_model.errorMessage();
setBlockDirtyChanged(false); setBlockDirtyChanged(false);
emit loaded(false); emit loaded(false);
return openResult; return openResult;
@@ -219,7 +220,8 @@ bool ResourceEditorDocument::saveImpl(QString *errorString, const FilePath &file
m_blockDirtyChanged = true; m_blockDirtyChanged = true;
m_model.setFilePath(filePath); m_model.setFilePath(filePath);
if (!m_model.save()) { if (!m_model.save()) {
*errorString = m_model.errorMessage(); if (errorString)
*errorString = m_model.errorMessage();
m_model.setFilePath(this->filePath()); m_model.setFilePath(this->filePath());
m_blockDirtyChanged = false; m_blockDirtyChanged = false;
return false; return false;