From 65fc47cb8f7c6c9f4a813050e0d56ce69362adfc Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Tue, 23 Nov 2021 10:55:01 -0800 Subject: [PATCH] Don't lose track of the sheet's screen Corner cases need to clear screen before loading a new file. Aborting needs to restore the screen or risk segfaults Fixes https://gitlab.com/kicad/code/kicad/issues/9739 --- eeschema/dialogs/dialog_sheet_properties.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eeschema/dialogs/dialog_sheet_properties.cpp b/eeschema/dialogs/dialog_sheet_properties.cpp index 5cb52c3873..ab486fdbc3 100644 --- a/eeschema/dialogs/dialog_sheet_properties.cpp +++ b/eeschema/dialogs/dialog_sheet_properties.cpp @@ -445,6 +445,7 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena bool restoreSheet = false; bool isExistingSheet = false; SCH_SCREEN* useScreen = nullptr; + SCH_SCREEN* oldScreen = nullptr; // Search for a schematic file having the same filename already in use in the hierarchy // or on disk, in order to reuse it. @@ -575,6 +576,7 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena // the screen reference counting in complex hierarchies. if( m_sheet->GetScreenCount() > 1 ) { + oldScreen = m_sheet->GetScreen(); m_sheet->SetScreen( nullptr ); loadFromFile = true; } @@ -617,7 +619,13 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena || m_frame->CheckSheetForRecursion( m_sheet, ¤tSheet ) ) { if( restoreSheet ) + { + // If we cleared the previous screen, restore it before returning to the user + if( oldScreen ) + m_sheet->SetScreen( oldScreen ); + currentSheet.LastScreen()->Append( m_sheet ); + } return false; }