Sfoglia il codice sorgente

Fix more use-after-delete errors

Ben Payne 11 anni fa
parent
commit
68b5e7b517

+ 2 - 2
Engine/source/environment/decalRoad.cpp

@@ -155,8 +155,8 @@ void DecalRoadNodeEvent::padListToSize()
       newlist->mPositions.merge(list->mPositions);
       newlist->mPositions.merge(list->mPositions);
       newlist->mWidths.merge(list->mWidths);
       newlist->mWidths.merge(list->mWidths);
 
 
-      mNodeList = newlist;
       delete list;
       delete list;
+      mNodeList = list = newlist;
    }
    }
 
 
    // Pad our list end?
    // Pad our list end?
@@ -1726,4 +1726,4 @@ DefineEngineMethod( DecalRoad, postApply, void, (),,
                   )
                   )
 {
 {
    object->inspectPostApply();
    object->inspectPostApply();
-}
+}

+ 1 - 1
Engine/source/environment/meshRoad.cpp

@@ -203,8 +203,8 @@ void MeshRoadNodeEvent::padListToSize()
       newlist->mDepths.merge(list->mDepths);
       newlist->mDepths.merge(list->mDepths);
       newlist->mNormals.merge(list->mNormals);
       newlist->mNormals.merge(list->mNormals);
 
 
-      mNodeList = newlist;
       delete list;
       delete list;
+      mNodeList = list = newlist;
    }
    }
 
 
    // Pad our list end?
    // Pad our list end?

+ 1 - 1
Engine/source/environment/river.cpp

@@ -227,8 +227,8 @@ void RiverNodeEvent::padListToSize()
       newlist->mDepths.merge(list->mDepths);
       newlist->mDepths.merge(list->mDepths);
       newlist->mNormals.merge(list->mNormals);
       newlist->mNormals.merge(list->mNormals);
 
 
-      mNodeList = newlist;
       delete list;
       delete list;
+      mNodeList = list = newlist;
    }
    }
 
 
    // Pad our list end?
    // Pad our list end?