zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 06:42:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added some safety checks for reading empty lumps into a std::vector.

Browse source 
These can trip the internal safety checks, even though nothing gets read in.
This commit is contained in:
Christoph Oelckers 2023-08-22 22:59:29 +02:00
parent 42283f56ab
commit 5a1b858c0e
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/common/filesystem/include/fs_files.h
View file

@ -194,8 +194,11 @@ public:
std::vector<uint8_t> Read(size_t len) std::vector<uint8_t> Read(size_t len)
{ {
std::vector<uint8_t> buffer(len); std::vector<uint8_t> buffer(len);
Size length = mReader->Read(&buffer[0], (long)len); if (len > 0)
buffer.resize((size_t)length); {
Size length = mReader->Read(&buffer[0], (long)len);
buffer.resize((size_t)length);
}
return buffer; return buffer;
} }
@ -208,9 +211,13 @@ public:
{ {
auto len = GetLength(); auto len = GetLength();
std::vector<uint8_t> buffer(len + padding); std::vector<uint8_t> buffer(len + padding);
Size length = mReader->Read(&buffer[0], (long)len); if (len > 0)
if (length < len) buffer.clear(); {
else memset(buffer.data() + len, 0, padding); Size length = mReader->Read(&buffer[0], (long)len);
if (length < len) buffer.clear();
else memset(buffer.data() + len, 0, padding);
}
else buffer[0] = 0;
return buffer; return buffer;
} }