diff options
author | madmaxoft <github@xoft.cz> | 2014-05-02 19:34:28 +0200 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-05-02 19:34:28 +0200 |
commit | 839447f0bbdf97eb9b3c07f943647fa9c92b1e5b (patch) | |
tree | 3cde3e248dc73e19f3b241245fdff612842f9632 /src/WorldStorage/WSSCompact.cpp | |
parent | A tiny speed improvement in ApplyFoodExhaustion() (diff) | |
parent | Fixed MagmaCube spawning. (diff) | |
download | cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.gz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.bz2 cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.lz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.xz cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.tar.zst cuberite-839447f0bbdf97eb9b3c07f943647fa9c92b1e5b.zip |
Diffstat (limited to 'src/WorldStorage/WSSCompact.cpp')
-rw-r--r-- | src/WorldStorage/WSSCompact.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/WorldStorage/WSSCompact.cpp b/src/WorldStorage/WSSCompact.cpp index 5435e6d5a..359bac4a8 100644 --- a/src/WorldStorage/WSSCompact.cpp +++ b/src/WorldStorage/WSSCompact.cpp @@ -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 @@ -797,7 +805,6 @@ void cWSSCompact::cPAKFile::UpdateChunk2To3() ++index2; } InChunkOffset += index2 / 2; - index2 = 0; AString Converted(ConvertedData, ExpectedSize); |