mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-23 07:54:13 +02:00
Shane Ringrose
5cc2e165bf
ProjectPropertiesDialog::exec() was using Qt::WindowModal, which only blocks the parent ProjectView window. The MDI workspace and its other subwindows remained interactive, so actions like new_project or close_project could fire while the dialog's config pages still held raw QETProject* pointers — leading to a SIGSEGV when Qt's event loop later dispatched a signal through one of those stale pointers. Detected by the 8-hour GUI fuzzer: action sequence add_diagram_page → flood_wires ×18 → new_project while Project Properties was open produced exit code -11 (SIGSEGV) on the first of 12,717 actions. Switch to Qt::ApplicationModal so no window can receive input while the dialog is open. Project Properties is a short-lived dialog; blocking the whole application for its duration matches user expectation and removes the lifetime hazard without requiring QPointer surgery across four config-page classes. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
96 lines
3.4 KiB
C++
96 lines
3.4 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include "projectpropertiesdialog.h"
|
|
|
|
#include "../configdialog.h"
|
|
#include "configpage/configpages.h"
|
|
#include "configpage/projectconfigpages.h"
|
|
#include "../TerminalStrip/ui/ConfigPage/terminalstripprojectconfigpage.h"
|
|
|
|
#include <QObject>
|
|
|
|
/**
|
|
@brief ProjectPropertiesDialog::ProjectPropertiesDialog
|
|
Default constructor
|
|
@param project : project to edit properties
|
|
@param parent : parent widget of this dialog
|
|
*/
|
|
ProjectPropertiesDialog::ProjectPropertiesDialog(QETProject *project, QWidget *parent)
|
|
{
|
|
m_properties_dialog = new ConfigDialog (parent);
|
|
m_properties_dialog -> setWindowTitle(QObject::tr("Propriétés du projet", "window title"));
|
|
m_properties_dialog -> addPage(new ProjectMainConfigPage(project));
|
|
|
|
NewDiagramPage *newDiagramPage = new NewDiagramPage(project,parent,this);
|
|
m_properties_dialog -> addPage(newDiagramPage);
|
|
|
|
ProjectAutoNumConfigPage *projectAutoNumConfigPage = new ProjectAutoNumConfigPage (project);
|
|
m_properties_dialog -> addPage(projectAutoNumConfigPage);
|
|
|
|
m_properties_dialog->addPage(new TerminalStripProjectConfigPage { project, parent });
|
|
|
|
connect(projectAutoNumConfigPage,SIGNAL(setAutoNum(QString)),newDiagramPage,SLOT(setFolioAutonum(QString)));
|
|
connect(projectAutoNumConfigPage,SIGNAL(saveCurrentTbp()),newDiagramPage,SLOT(saveCurrentTbp()));
|
|
connect(projectAutoNumConfigPage,SIGNAL(loadSavedTbp()),newDiagramPage,SLOT(loadSavedTbp()));
|
|
}
|
|
|
|
/**
|
|
@brief ProjectPropertiesDialog::~ProjectPropertiesDialog
|
|
*/
|
|
ProjectPropertiesDialog::~ProjectPropertiesDialog ()
|
|
{
|
|
delete m_properties_dialog;
|
|
}
|
|
|
|
/**
|
|
@brief ProjectPropertiesDialog::exec
|
|
execute this dialog.
|
|
*/
|
|
void ProjectPropertiesDialog::exec()
|
|
{
|
|
// ApplicationModal (not WindowModal) so no other window — including other
|
|
// MDI subwindows — can dispatch events while the dialog holds raw
|
|
// QETProject* pointers in its config pages. WindowModal only blocks the
|
|
// parent ProjectView; the rest of the MDI area stays live, which allowed
|
|
// new_project / close_project to replace the project under the dialog
|
|
// and cause a SIGSEGV. See issue #527.
|
|
m_properties_dialog->setWindowModality(Qt::ApplicationModal);
|
|
m_properties_dialog -> exec();
|
|
}
|
|
|
|
/**
|
|
@brief ProjectPropertiesDialog::setCurrentPage
|
|
Change the current displayed page by p.
|
|
@param p : page to display
|
|
*/
|
|
void ProjectPropertiesDialog::setCurrentPage(ProjectPropertiesDialog::Page p) {
|
|
m_properties_dialog -> setCurrentPage(static_cast <int> (p));
|
|
}
|
|
|
|
/**
|
|
@brief ProjectPropertiesDialog::changeToFolio
|
|
Change the current displayed tab to folio tab.
|
|
*/
|
|
void ProjectPropertiesDialog::changeToFolio()
|
|
{
|
|
ProjectAutoNumConfigPage *autoNumPage =
|
|
static_cast <ProjectAutoNumConfigPage*>(
|
|
m_properties_dialog->pages.at(2));
|
|
autoNumPage->changeToTab(3);
|
|
}
|