Ticket #1390: 1390-null-ptr-dereference-m_BoneMatrices.patch

source/graphics/Model.cpp

@@ -370 +370 @@
     // that doing so will cause a revalidation of this model (see recursion above).
     m_PositionValid = true;
     
-    // re-position and validate all props
-    for (size_t j = 0; j < m_Props.size(); ++j)
+    if (m_BoneMatrices)
     {
-        const Prop& prop=m_Props[j];
+        // re-position and validate all props
+        for (size_t j = 0; j < m_Props.size(); ++j)
+        {
+            const Prop& prop=m_Props[j];
 
-        CMatrix3D proptransform = prop.m_Point->m_Transform;;
-        if (prop.m_Point->m_BoneIndex != 0xff)
-        {
-            CMatrix3D boneMatrix = m_BoneMatrices[prop.m_Point->m_BoneIndex];
-            if (!worldSpaceBoneMatrices)
-                boneMatrix.Concatenate(GetTransform());
-            proptransform.Concatenate(boneMatrix);
-        }
-        else
-        {
-            // not relative to any bone; just apply world-space transformation (i.e. relative to object-space origin)
-            proptransform.Concatenate(m_Transform);
-        }
+            CMatrix3D proptransform = prop.m_Point->m_Transform;;
+            if (prop.m_Point->m_BoneIndex != 0xff)
+            {
+                CMatrix3D boneMatrix = m_BoneMatrices[prop.m_Point->m_BoneIndex];
+                if (!worldSpaceBoneMatrices)
+                    boneMatrix.Concatenate(GetTransform());
+                proptransform.Concatenate(boneMatrix);
+            }
+            else
+            {
+                // not relative to any bone; just apply world-space transformation (i.e. relative to object-space origin)
+                proptransform.Concatenate(m_Transform);
+            }
         
-        prop.m_Model->SetTransform(proptransform);
-        prop.m_Model->ValidatePosition();
-    }
+            prop.m_Model->SetTransform(proptransform);
+            prop.m_Model->ValidatePosition();
+        }
 
-    if (m_BoneMatrices)
-    {
         for (size_t i = 0; i < m_pModelDef->GetNumBones(); i++)
         {
             m_BoneMatrices[i] = m_BoneMatrices[i] * m_pModelDef->GetInverseBindBoneMatrices()[i];