flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #948 from jfhumann/staticFixes

Browse Source 
Fixes motivated by Coverity #1
This commit is contained in:
Mattes D
2014-04-27 17:00:37 +02:00
parent da931da603 a1765a2896
commit a0f6149d05
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WorldStorage/WSSCompact.cpp
View File

@@ -468,7 +468,15 @@ cWSSCompact::cPAKFile::cPAKFile(const AString & a_FileName, int a_LayerX, int a_
for (int i = 0; i < NumChunks; i++)
{
sChunkHeader * Header = new sChunkHeader;
READ(*Header);
// Here we do not use the READ macro, as it does not free the resources
// allocated with new in case of error.
if (f.Read(Header, sizeof(*Header)) != sizeof(*Header))
{
LOGERROR("ERROR READING %s FROM FILE %s (line %d); file offset %d", "Header", m_FileName.c_str(), __LINE__, f.Tell());
delete Header;
return;
}
m_ChunkHeaders.push_back(Header);
} // for i - chunk headers