TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix use-after-delete

Browse source
This commit is contained in:
Ben Payne 2014-11-11 15:15:55 -05:00
parent 68b5e7b517
commit dc780ddcae
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/materials/materialList.cpp
View file

@ -263,8 +263,6 @@ void MaterialList::clearMatInstList()
if (mMatInstList[i]) if (mMatInstList[i])
{ {
BaseMatInstance* current = mMatInstList[i]; BaseMatInstance* current = mMatInstList[i];
delete current;
mMatInstList[i] = NULL;
// ok, since ts material lists can remap difference indexes to the same object // ok, since ts material lists can remap difference indexes to the same object
// we need to make sure that we don't delete the same memory twice. walk the // we need to make sure that we don't delete the same memory twice. walk the
@ -272,6 +270,9 @@ void MaterialList::clearMatInstList()
for (U32 j=0; j<mMatInstList.size(); j++) for (U32 j=0; j<mMatInstList.size(); j++)
if (mMatInstList[j] == current) if (mMatInstList[j] == current)
mMatInstList[j] = NULL; mMatInstList[j] = NULL;
mMatInstList[i] = NULL;
delete current;
} }
} }
} }