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

CppEditor: fix crash in outline

Browse Source 
Make sure the document lives as long as the generated symbol items.

Fixes: QTCREATORBUG-28091
Change-Id: I515748ab7fd198699434ac5c19585afa20df613d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2022-08-23 13:47:26 +02:00
parent 8b143be86c
commit 09f0ddb50c
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/cppoverviewmodel.cpp
View File

@@ -206,9 +206,8 @@ QMimeData *OverviewModel::mimeData(const QModelIndexList &indexes) const
void OverviewModel::update(CPlusPlus::Document::Ptr doc) void OverviewModel::update(CPlusPlus::Document::Ptr doc)
{ {
m_cppDocument = doc; m_candidate = doc;
if (doc) m_updateTimer->start();
m_updateTimer->start();
} }
int OverviewModel::editorRevision() int OverviewModel::editorRevision()
@@ -219,6 +218,8 @@ int OverviewModel::editorRevision()
void OverviewModel::rebuild() void OverviewModel::rebuild()
{ {
beginResetModel(); beginResetModel();
m_cppDocument = m_candidate;
m_candidate.reset();
auto root = new SymbolItem; auto root = new SymbolItem;
if (m_cppDocument) if (m_cppDocument)
buildTree(root, true); buildTree(root, true);

1
src/plugins/cppeditor/cppoverviewmodel.h
View File

@@ -80,6 +80,7 @@ private:
void buildTree(SymbolItem *root, bool isRoot); void buildTree(SymbolItem *root, bool isRoot);
private: private:
CPlusPlus::Document::Ptr m_candidate;
CPlusPlus::Document::Ptr m_cppDocument; CPlusPlus::Document::Ptr m_cppDocument;
CPlusPlus::Overview m_overview; CPlusPlus::Overview m_overview;
friend class SymbolItem; friend class SymbolItem;