summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@qt.io>2021-02-23 09:28:05 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-23 11:34:44 +0000
commiteb7f92d04f4c64445403af6106f2201f35179f3f (patch)
treed05528f842b48449aafebde44945e2d65b18e523
parent4dee143fb84fd738672128c997b3c9fd4114eb07 (diff)
Only create the GLXYSeriesData if there is no existing data
This ensures that there is no memory leak due to unnecessary creation of the GLXYSeriesData when setting the series data. Change-Id: Iec7966bbbf53e595ead780462c89bb3e1205854e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> (cherry picked from commit eaf63689403df7f122591795d80ef126b8fb5eaa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/chartsqml2/declarativeopenglrendernode.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp
index 4e07acfd..36feb0b5 100644
--- a/src/chartsqml2/declarativeopenglrendernode.cpp
+++ b/src/chartsqml2/declarativeopenglrendernode.cpp
@@ -231,7 +231,8 @@ void DeclarativeOpenGLRenderNode::setSeriesData(bool mapDirty, const GLXYDataMap
GLXYSeriesData *data = oldMap.take(i.key());
const GLXYSeriesData *newData = i.value();
if (!data || newData->dirty) {
- data = new GLXYSeriesData;
+ if (!data)
+ data = new GLXYSeriesData;
*data = *newData;
}
m_xyDataMap.insert(i.key(), data);