Fix memory corruption when vector being resized

supertuxkart · Jan 25, 2024 · e1454a0 · e1454a0
1 parent ec83629
commit e1454a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp
@@ -213,9 +213,11 @@ void KartModel::loadInfo(const XMLNode &node)
     {
         if (const XMLNode *speed_weighted_objects_node = node.getNode("speed-weighted-objects"))
         {
-            for (unsigned int i = 0 ;i < speed_weighted_objects_node->getNumNodes() ; i++)
+            unsigned speed_weighted_objects_size = speed_weighted_objects_node->getNumNodes();
+            m_speed_weighted_objects.resize(speed_weighted_objects_size);
+            for (unsigned int i = 0 ;i < speed_weighted_objects_size; i++)
             {
-                loadSpeedWeightedInfo(speed_weighted_objects_node->getNode(i));
+                loadSpeedWeightedInfo(speed_weighted_objects_node->getNode(i), i);
             }
         }
         if (const XMLNode* headlights_node = node.getNode("headlights"))
@@ -797,9 +799,9 @@ void KartModel::loadNitroEmitterInfo(const XMLNode &node,
 }   // loadNitroEmitterInfo
 
 // ----------------------------------------------------------------------------
-
 /** Loads a single speed weighted node. */
-void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node)
+void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node,
+                                      int index)
 {
     SpeedWeightedObject obj;
     if (speed_weighted_node->getName() == "object")
@@ -824,7 +826,7 @@ void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node)
     }
     if (!obj.m_name.empty())
     {
-        m_speed_weighted_objects.push_back(obj);
+        m_speed_weighted_objects[index] = obj;
         float dx = 0.0f;
         float dy = 0.0f;
         float dt = 0.0f;
@@ -835,7 +837,7 @@ void KartModel::loadSpeedWeightedInfo(const XMLNode* speed_weighted_node)
         speed_weighted_node->get("animated-by-step", &step);
         if (dx != 0.0f || dy != 0.0f)
         {
-            m_speed_weighted_objects.back().m_properties.m_moving_texture =
+            m_speed_weighted_objects[index].m_properties.m_moving_texture =
                 new MovingTexture(dx, dy, dt, step);
         }
     }

diff --git a/src/karts/kart_model.hpp b/src/karts/kart_model.hpp
@@ -298,7 +298,7 @@ class KartModel : public scene::IAnimationEndCallBack, public NoCopy
     void  loadNitroEmitterInfo(const XMLNode &node,
                         const std::string &emitter_name, int index);
 
-    void  loadSpeedWeightedInfo(const XMLNode* speed_weighted_node);
+    void  loadSpeedWeightedInfo(const XMLNode* speed_weighted_node, int index);
 
     void  loadHeadlights(const XMLNode &node);