zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed allocation size when constructing a string from a file system entry. 

The internal allocator already added space for the terminazing \0, so the string's size was one character too large.
This commit is contained in:
Christoph Oelckers 2022-08-17 21:10:15 +02:00
parent 8d3c1adf05
commit 513d8cea8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/filesystem/filesystem.cpp
View File

@ -1608,17 +1608,17 @@ FileData::~FileData ()
{ {
} }
FString::FString (ELumpNum lumpnum) FString::FString(ELumpNum lumpnum)
{ {
auto lumpr = fileSystem.OpenFileReader ((int)lumpnum); auto lumpr = fileSystem.OpenFileReader((int)lumpnum);
auto size = lumpr.GetLength (); auto size = lumpr.GetLength();
AllocBuffer (1 + size); AllocBuffer(size);
auto numread = lumpr.Read (&Chars[0], size); auto numread = lumpr.Read(&Chars[0], size);
Chars[size] = '\0'; Chars[size] = '\0';
if (numread != size) if (numread != size)
{ {
I_Error ("ConstructStringFromLump: Only read %ld of %ld bytes on lump %i (%s)\n", I_Error("ConstructStringFromLump: Only read %ld of %ld bytes on lump %i (%s)\n",
numread, size, lumpnum, fileSystem.GetFileFullName((int)lumpnum)); numread, size, lumpnum, fileSystem.GetFileFullName((int)lumpnum));
} }
} }