OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#8615 Qt Charts: fix use-after-free crash.

Browse Source 
Fixes #8615.
This commit is contained in:
Kristian Bendiksen 2022-03-04 15:24:51 +01:00 committed by Magne Sjaastad
parent 7a954804ef
commit 93f754102d
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -131,6 +131,7 @@ RimPlotCurve::~RimPlotCurve()
{ {
if ( m_plotCurve ) if ( m_plotCurve )
{ {
m_plotCurve->detach();
delete m_plotCurve; delete m_plotCurve;
m_plotCurve = nullptr; m_plotCurve = nullptr;
} }

8
ApplicationLibCode/UserInterface/RiuQtChartsPlotCurve.cpp
View File

@ -58,6 +58,8 @@ RiuQtChartsPlotCurve::~RiuQtChartsPlotCurve()
{ {
if ( m_plotWidget && m_plotWidget->qtChart() ) if ( m_plotWidget && m_plotWidget->qtChart() )
{ {
m_plotWidget->detach( this );
auto* line = lineSeries(); auto* line = lineSeries();
if ( line ) if ( line )
{ {
@ -184,7 +186,11 @@ void RiuQtChartsPlotCurve::detach()
scatterSeries()->hide(); scatterSeries()->hide();
} }
if ( m_plotWidget ) setVisibleInLegend( false ); if ( m_plotWidget )
{
m_plotWidget->detach( this );
setVisibleInLegend( false );
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

9
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
View File

@ -814,6 +814,15 @@ void RiuQtChartsPlotWidget::attach( RiuPlotCurve* plotCurve,
addToChart( m_scatterSeriesMap, plotCurve, scatterSeries, xAxis, yAxis, qtChartsPlotCurve ); addToChart( m_scatterSeriesMap, plotCurve, scatterSeries, xAxis, yAxis, qtChartsPlotCurve );
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQtChartsPlotWidget::detach( RiuPlotCurve* plotCurve )
{
m_lineSeriesMap.erase( plotCurve );
m_scatterSeriesMap.erase( plotCurve );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h
View File

@ -162,6 +162,7 @@ public:
QtCharts::QAbstractSeries* scatterSeries, QtCharts::QAbstractSeries* scatterSeries,
RiuPlotAxis xAxis, RiuPlotAxis xAxis,
RiuPlotAxis yAxis ); RiuPlotAxis yAxis );
void detach( RiuPlotCurve* plotCurve );
QtCharts::QAbstractSeries* getLineSeries( const RiuPlotCurve* plotCurve ) const; QtCharts::QAbstractSeries* getLineSeries( const RiuPlotCurve* plotCurve ) const;
QtCharts::QAbstractSeries* getScatterSeries( const RiuPlotCurve* plotCurve ) const; QtCharts::QAbstractSeries* getScatterSeries( const RiuPlotCurve* plotCurve ) const;