zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-16 17:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: ZScript's lump reader may not truncate strings at 0 bytes, like all other callers of GetStringFromLump need.

Browse source
This commit is contained in:
Christoph Oelckers 2023-09-16 07:44:21 +02:00
parent 45a2cbe081
commit 71cc93f42c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/scripting/interface/vmnatives.cpp
View file

@ -844,7 +844,7 @@ DEFINE_ACTION_FUNCTION(_Wads, ReadLump)
PARAM_PROLOGUE;
PARAM_INT(lump);
const bool isLumpValid = lump >= 0 && lump < fileSystem.GetNumEntries();
ACTION_RETURN_STRING(isLumpValid ? GetStringFromLump(lump) : FString());
ACTION_RETURN_STRING(isLumpValid ? GetStringFromLump(lump, false) : FString());
}
//==========================================================================

4
src/common/utility/cmdlib.cpp
View file

@ -1016,10 +1016,10 @@ void uppercopy(char* to, const char* from)
// Loads a zero terminated string from a lump in the file system
//==========================================================================
FString GetStringFromLump(int lump)
FString GetStringFromLump(int lump, bool zerotruncate)
{
auto fd = fileSystem.ReadFile(lump);
FString ScriptBuffer(fd.GetString(), fd.GetSize());
ScriptBuffer.Truncate(strlen(ScriptBuffer.GetChars())); // this is necessary to properly truncate the generated string to not contain 0 bytes.
if (zerotruncate) ScriptBuffer.Truncate(strlen(ScriptBuffer.GetChars())); // this is necessary to properly truncate the generated string to not contain 0 bytes.
return ScriptBuffer;
}

2
src/common/utility/cmdlib.h
View file

@ -87,7 +87,7 @@ struct MD5Context;
void md5Update(FileReader& file, MD5Context& md5, unsigned len);
void uppercopy(char* to, const char* from);
FString GetStringFromLump(int lump);
FString GetStringFromLump(int lump, bool zerotruncate = true);
inline void fillshort(void* buff, size_t count, uint16_t clear)
{