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

cppcheck found an out of bound array access. (#4182)

Browse Source 
The ChunkHeader array is five unsigned chars big, they're indexed
0..4 - but in the error message (when ChunkHeader[4] isn't 2 -
indicating zlib compression, which seems to be the only allowed
compression method for chunks) the contents of ChunkHeader[5]
is printed. Maybe not so dangerous, but it'll give garbage results
in the log.
This commit is contained in:
Michael Hinz 2018-02-04 21:41:49 +01:00 committed by Alexander Harkness
parent f0c735e846
commit a28a93c9ca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/BlockZapper/Zapper.cpp
View File

@ -162,7 +162,7 @@ void cZapper::LoadChunkData(cFile & a_InFile, int a_ChunkHeaderValue, AString &
a_InFile.Read(ChunkHeader, sizeof(ChunkHeader)); a_InFile.Read(ChunkHeader, sizeof(ChunkHeader));
if (ChunkHeader[4] != 2) if (ChunkHeader[4] != 2)
{ {
fprintf(stderr, "Chunk [%d, %d] is compressed in an unknown scheme (%d), skipping", a_ChunkX, a_ChunkZ, ChunkHeader[5]); fprintf(stderr, "Chunk [%d, %d] is compressed in an unknown scheme (%d), skipping", a_ChunkX, a_ChunkZ, ChunkHeader[4]);
return; return;
} }
int ActualSize = (ChunkHeader[0] << 24) | (ChunkHeader[1] << 16) | (ChunkHeader[2] << 8) | ChunkHeader[3]; int ActualSize = (ChunkHeader[0] << 24) | (ChunkHeader[1] << 16) | (ChunkHeader[2] << 8) | ChunkHeader[3];