Fix UB on iterate and erase

The old code at least doesn't crash on Qt 5, but it's UB.
The same code will crash on Qt 6 though.

Change-Id: I53f7c683b4d3044921a0a34723b503885f454699
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp b/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp
index f673f2e..6378660 100644
--- a/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp
+++ b/src/runtimerender/Qt3DSDistanceFieldRenderer.cpp
@@ -97,27 +97,27 @@ void Q3DSDistanceFieldRenderer::EndFrame()
     // Remove meshes for glyphs that weren't rendered last frame
     NVAllocatorCallback &alloc = m_context->GetAllocator();
 
-    QHash<size_t, QHash<Q3DSDistanceFieldGlyphCache::TextureInfo *, GlyphInfo>>::const_iterator
-            glyphIt = m_glyphCache.constBegin();
-    while (glyphIt != m_glyphCache.constEnd()) {
+    QHash<size_t, QHash<Q3DSDistanceFieldGlyphCache::TextureInfo *, GlyphInfo>>::iterator
+            glyphIt = m_glyphCache.begin();
+    while (glyphIt != m_glyphCache.end()) {
         const size_t textHash = glyphIt.key();
         if (!m_renderedTexts.contains(textHash))
-            m_glyphCache.erase(glyphIt++);
+            glyphIt = m_glyphCache.erase(glyphIt);
         else
-            glyphIt++;
+            ++glyphIt;
     }
 
-    QHash<size_t, Q3DSDistanceFieldMesh>::const_iterator meshIt = m_meshCache.constBegin();
-    while (meshIt != m_meshCache.constEnd()) {
+    QHash<size_t, Q3DSDistanceFieldMesh>::iterator meshIt = m_meshCache.begin();
+    while (meshIt != m_meshCache.end()) {
         const size_t glyphHash = meshIt.key();
         const Q3DSDistanceFieldMesh &mesh = meshIt.value();
         if (!m_renderedGlyphs.contains(glyphHash)) {
             NVDelete(alloc, mesh.vertexBuffer);
             NVDelete(alloc, mesh.indexBuffer);
             NVDelete(alloc, mesh.inputAssembler);
-            m_meshCache.erase(meshIt++);
+            meshIt = m_meshCache.erase(meshIt);
         } else {
-            meshIt++;
+            ++meshIt;
         }
     }