josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Collision: Fixed possible memory leaks

Browse Source
This commit is contained in:
Shauren
2011-05-11 14:11:20 +02:00
parent ed3700634f
commit 2fd70ed49d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/collision/Maps/TileAssembler.cpp
+6 -3
View File
@@ -264,8 +264,9 @@ namespace VMAP
// temporary use defines to simplify read/check code (close file and return at fail) // temporary use defines to simplify read/check code (close file and return at fail)
#define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \
fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++;
// only use this for array deletes
#define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \
fclose(rf); printf("readfail, op = %i\n", readOperation); delete V; return(false); }readOperation++; fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++;
#define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \
fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
@@ -334,6 +335,7 @@ namespace VMAP
delete[] vectorarray; delete[] vectorarray;
// drop of temporary use defines // drop of temporary use defines
#undef READ_OR_RETURN #undef READ_OR_RETURN
#undef READ_OR_RETURN_WITH_DELETE
#undef CMP_OR_RETURN #undef CMP_OR_RETURN
} }
spawn.iBound = modelBound + spawn.iPos; spawn.iBound = modelBound + spawn.iPos;
@@ -375,7 +377,7 @@ namespace VMAP
#define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \ #define READ_OR_RETURN(V, S) if(fread((V), (S), 1, rf) != 1) { \
fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++; fclose(rf); printf("readfail, op = %i\n", readOperation); return(false); }readOperation++;
#define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \ #define READ_OR_RETURN_WITH_DELETE(V, S) if(fread((V), (S), 1, rf) != 1) { \
fclose(rf); printf("readfail, op = %i\n", readOperation); delete V; return(false); }readOperation++; fclose(rf); printf("readfail, op = %i\n", readOperation); delete[] V; return(false); }readOperation++;
#define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \ #define CMP_OR_RETURN(V, S) if(strcmp((V), (S)) != 0) { \
fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); } fclose(rf); printf("cmpfail, %s!=%s\n", V, S);return(false); }
@@ -482,6 +484,7 @@ namespace VMAP
// drop of temporary use defines // drop of temporary use defines
#undef READ_OR_RETURN #undef READ_OR_RETURN
#undef READ_OR_RETURN_WITH_DELETE
#undef CMP_OR_RETURN #undef CMP_OR_RETURN
} }
@@ -490,7 +493,7 @@ namespace VMAP
// write WorldModel // write WorldModel
WorldModel model; WorldModel model;
model.setRootWmoID(RootWMOID); model.setRootWmoID(RootWMOID);
if (groupsArray.size()) if (!groupsArray.empty())
{ {
model.setGroupModels(groupsArray); model.setGroupModels(groupsArray);
success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo"); success = model.writeFile(iDestDir + "/" + pModelFilename + ".vmo");