AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if out of memory reading dat/fcm/lvl/cw maps or .wav files

Browse Source
This commit is contained in:
UnknownShadow200 2019-08-06 22:07:25 +10:00
parent 740ba21c78
commit 137813cec8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Audio.c
View File

@ -473,8 +473,10 @@ static ReturnCode Sound_ReadWaveData(struct Stream* stream, struct Sound* snd) {
snd->Format.BitsPerSample = Stream_GetU16_LE(&tmp[14]);
size -= WAV_FMT_SIZE;
} else if (fourCC == WAV_FourCC('d','a','t','a')) {
snd->Data = (uint8_t*)Mem_Alloc(size, 1, "WAV sound data");
snd->Data = (uint8_t*)Mem_TryAlloc(size, 1);
snd->Size = size;
if (!snd->Data) return ERR_OUT_OF_MEMORY;
return Stream_Read(stream, snd->Data, size);
}

14
src/Formats.c
View File

@ -22,7 +22,9 @@
*#########################################################################################################################*/
static ReturnCode Map_ReadBlocks(struct Stream* stream) {
World.Volume = World.Width * World.Length * World.Height;
World.Blocks = (BlockRaw*)Mem_Alloc(World.Volume, 1, "map blocks");
World.Blocks = (BlockRaw*)Mem_TryAlloc(World.Volume, 1);
if (!World.Blocks) return ERR_OUT_OF_MEMORY;
return Stream_Read(stream, World.Blocks, World.Volume);
}
@ -398,9 +400,11 @@ static ReturnCode Nbt_ReadTag(uint8_t typeId, bool readTagName, struct Stream* s
if (NbtTag_IsSmall(&tag)) {
res = Stream_Read(stream, tag.Value.Small, tag.DataSize);
} else {
tag.Value.Big = (uint8_t*)Mem_Alloc(tag.DataSize, 1, "NBT data");
tag.Value.Big = (uint8_t*)Mem_TryAlloc(tag.DataSize, 1);
if (!tag.Value.Big) return ERR_OUT_OF_MEMORY;
res = Stream_Read(stream, tag.Value.Big, tag.DataSize);
if (res) { Mem_Free(tag.Value.Big); }
if (res) Mem_Free(tag.Value.Big);
}
break;
case NBT_STR:
@ -877,7 +881,9 @@ static ReturnCode Dat_ReadFieldData(struct Stream* stream, struct JFieldDesc* fi
if ((res = Stream_ReadU32_BE(stream, &count))) return res;
field->Value.Array.Size = count;
field->Value.Array.Ptr = (uint8_t*)Mem_Alloc(count, 1, ".dat map blocks");
field->Value.Array.Ptr = (uint8_t*)Mem_TryAlloc(count, 1);
if (!field->Value.Array.Ptr) return ERR_OUT_OF_MEMORY;
res = Stream_Read(stream, field->Value.Array.Ptr, count);
if (res) { Mem_Free(field->Value.Array.Ptr); return res; }
} break;