OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 07:00:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoids iterator invalidation in QwtPlot item lists

Browse Source 
When working with a summary ensemble in a Debug build on Windows, a crash happened in RiuQwtPlotWidget::resetPlotCurveHighlighting(). When iterating over list of plot items, one pointer to item pointed to 0xddddddd, a clear indication that the underlying list had been updated during the loop and the iterator invalidated.

The change ensures that modifications to the item list during iteration do not cause unexpected behavior, particularly in scenarios involving grid lines and curve highlighting.

This is achieved by making a copy of the item list before iteration when modifications may occur. For cases where no add/remove will be performed during the iteration, a comment is added to clarify that it is safe to access the reference to the list.
This commit is contained in:
Magne Sjaastad committed 2025-10-14 12:52:24 +02:00
1 parent b704f1f607
commit 5f2e2919c8
6 files changed
+14 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
+9 -2
View File
@@ -349,6 +349,7 @@ void RiuQwtPlotWidget::setAxisLabelsAndTicksEnabled( RiuPlotAxis axis, bool enab
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::enableGridLines( RiuPlotAxis axis, bool majorGridLines, bool minorGridLines )
{
// NB: Make a copy, not reference to avoid iterator invalidation
QwtPlotItemList plotItems = m_plot->itemList( QwtPlotItem::Rtti_PlotGrid );
auto qwtAxis = toQwtPlotAxis( axis );
for ( QwtPlotItem* plotItem : plotItems )
@@ -893,6 +894,7 @@ void RiuQwtPlotWidget::findClosestPlotItem( const QPoint& pos, QwtPlotItem** clo
*closestCurveSampleIndex = -1;
*distanceFromClick = std::numeric_limits<double>::infinity();
// Ok to access reference to list, no add/remove of item during iteration
const QwtPlotItemList& itmList = m_plot->itemList();
for ( auto it : itmList )
{
@@ -1109,6 +1111,7 @@ void RiuQwtPlotWidget::highlightPlotCurves( const std::vector<RimPlotCurve*>& cu
return;
}
// NB: Make a copy, not reference to avoid iterator invalidation
auto plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{
@@ -1190,6 +1193,7 @@ void RiuQwtPlotWidget::highlightPlotCurves( const std::vector<RimPlotCurve*>& cu
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::highlightPlotShapeItems( const std::set<const QwtPlotItem*>& closestItems )
{
// NB: Make a copy, not reference to avoid iterator invalidation
auto plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{
@@ -1238,7 +1242,8 @@ void RiuQwtPlotWidget::resetPlotCurveHighlighting()
return;
}
const auto& plotItemList = m_plot->itemList();
// NB: Make a copy, not reference to avoid iterator invalidation
const QwtPlotItemList plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{
if ( auto* riuPlotCurve = dynamic_cast<RiuQwtPlotCurve*>( plotItem ) )
@@ -1260,7 +1265,8 @@ void RiuQwtPlotWidget::resetPlotCurveHighlighting()
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::resetPlotShapeItemHighlighting()
{
const auto& plotItemList = m_plot->itemList();
// NB: Make a copy, not reference to avoid iterator invalidation
const QwtPlotItemList plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{
auto* plotShapeItem = dynamic_cast<QwtPlotShapeItem*>( plotItem );
@@ -1312,6 +1318,7 @@ void RiuQwtPlotWidget::highlightPlotItemsForQwtAxis( QwtAxisId axisId )
{
std::vector<RimPlotCurve*> curves;
// NB: Make a copy, not reference to avoid iterator invalidation
auto plotItemList = m_plot->itemList();
for ( QwtPlotItem* plotItem : plotItemList )
{