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

Properly deallocate memory in tile assembler, and dereference memory when fread fails.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
raczman
2009-05-13 13:22:43 +02:00
parent 62c5720227
commit 5748c36621
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/vmap/TileAssembler.cpp
+18 -18
View File
@@ -416,57 +416,57 @@ namespace VMAP
AABSPTree<Triangle> *gtree = new AABSPTree<Triangle>(); AABSPTree<Triangle> *gtree = new AABSPTree<Triangle>();
G3D::uint32 flags; G3D::uint32 flags;
if(fread(&flags, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&flags, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
G3D::uint32 branches; G3D::uint32 branches;
if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
if(strcmp(blockId, "GRP ") != 0) { fclose(rf); return(false); } if(strcmp(blockId, "GRP ") != 0) { fclose(rf); delete gtree; return(false); }
if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
if(fread(&branches, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&branches, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
for(int b=0;b<(int)branches; b++) for(int b=0;b<(int)branches; b++)
{ {
G3D::uint32 indexes; G3D::uint32 indexes;
// indexes for each branch (not used jet) // indexes for each branch (not used jet)
if(fread(&indexes, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&indexes, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
} }
// ---- indexes // ---- indexes
if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
if(strcmp(blockId, "INDX") != 0) { fclose(rf); return(false); } if(strcmp(blockId, "INDX") != 0) { fclose(rf); delete gtree; return(false); }
if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
unsigned int nindexes; unsigned int nindexes;
if(fread(&nindexes, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&nindexes, sizeof(G3D::uint32), 1, rf) != 1) { fclose(rf); return(false); }
if(nindexes >0) if(nindexes >0)
{ {
unsigned short *indexarray = new unsigned short[nindexes*sizeof(unsigned short)]; unsigned short *indexarray = new unsigned short[nindexes*sizeof(unsigned short)];
if(fread(indexarray, sizeof(unsigned short), nindexes, rf) != nindexes) { fclose(rf); return(false); } if(fread(indexarray, sizeof(unsigned short), nindexes, rf) != nindexes) { fclose(rf); delete gtree; delete[] indexarray; return(false); }
for(int i=0;i<(int)nindexes; i++) for(int i=0;i<(int)nindexes; i++)
{ {
unsigned short val = indexarray[i]; unsigned short val = indexarray[i];
tempIndexArray.append(val); tempIndexArray.append(val);
} }
delete indexarray; delete[] indexarray;
} }
// ---- vectors // ---- vectors
if(fread(&blockId, 4, 1, rf) != 1) {fclose(rf); return(false); } if(fread(&blockId, 4, 1, rf) != 1) {fclose(rf); delete gtree; return(false); }
if(strcmp(blockId, "VERT") != 0) { fclose(rf); return(false); } if(strcmp(blockId, "VERT") != 0) { fclose(rf); return(false); }
if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
unsigned int nvectors; unsigned int nvectors;
if(fread(&nvectors, sizeof(int), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&nvectors, sizeof(int), 1, rf) != 1) { fclose(rf); delete gtree; return(false); }
float *vectorarray = 0; float *vectorarray = 0;
if(nvectors >0) if(nvectors >0)
{ {
vectorarray = new float[nvectors*sizeof(float)*3]; vectorarray = new float[nvectors*sizeof(float)*3];
if(fread(vectorarray, sizeof(float)*3, nvectors, rf) != nvectors) { fclose(rf); return(false); } if(fread(vectorarray, sizeof(float)*3, nvectors, rf) != nvectors) { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
} }
// ----- liquit // ----- liquit
if(flags & 1) if(flags & 1)
{ {
// we have liquit -> not handled yet ... skip // we have liquit -> not handled yet ... skip
if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blockId, 4, 1, rf) != 1) { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
if(strcmp(blockId, "LIQU") != 0) { fclose(rf); return(false); } if(strcmp(blockId, "LIQU") != 0) { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); return(false); } if(fread(&blocksize, sizeof(int), 1, rf) != 1) { fclose(rf); delete gtree; delete[] vectorarray; return(false); }
fseek(rf, blocksize, SEEK_CUR); fseek(rf, blocksize, SEEK_CUR);
} }