From d51aae9ad1ae1bd684a5ba3c500a8bf42af68bb3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 18 Sep 2024 16:09:16 +0200 Subject: [PATCH] ResourceEditor: Fix nullptr access 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 --- src/plugins/resourceeditor/resourceeditor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/resourceeditor/resourceeditor.cpp b/src/plugins/resourceeditor/resourceeditor.cpp index c0a936ccecd..87ab217740e 100644 --- a/src/plugins/resourceeditor/resourceeditor.cpp +++ b/src/plugins/resourceeditor/resourceeditor.cpp @@ -193,7 +193,8 @@ IDocument::OpenResult ResourceEditorDocument::open(QString *errorString, OpenResult openResult = m_model.reload(); if (openResult != OpenResult::Success) { - *errorString = m_model.errorMessage(); + if (errorString) + *errorString = m_model.errorMessage(); setBlockDirtyChanged(false); emit loaded(false); return openResult; @@ -219,7 +220,8 @@ bool ResourceEditorDocument::saveImpl(QString *errorString, const FilePath &file m_blockDirtyChanged = true; m_model.setFilePath(filePath); if (!m_model.save()) { - *errorString = m_model.errorMessage(); + if (errorString) + *errorString = m_model.errorMessage(); m_model.setFilePath(this->filePath()); m_blockDirtyChanged = false; return false;