thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-30 03:32:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M_TokenizerOpen: pass size in as argument instead of calling strlen implicitly

Browse source 
This function is used for parsing TEXTMAP and the data is
not NUL-terminated.
This commit is contained in:
James R 2024-02-08 18:16:39 -08:00
parent 78a727e9cb
commit 56e710266c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdef.h
View file

@ -500,7 +500,7 @@ char *M_GetToken(const char *inputString);
void M_UnGetToken(void);
UINT32 M_GetTokenPos(void);
void M_TokenizerOpen(const char *inputString);
void M_TokenizerOpen(const char *inputString, size_t inputLength);
void M_TokenizerClose(void);
const char *M_TokenizerRead(UINT32 i);
UINT32 M_TokenizerGetEndPos(void);

2
src/k_rank.cpp
View file

@ -199,7 +199,7 @@ static boolean RankCapsules_LoadMapData(const virtres_t *virt)
if (g_rankCapsules_udmf) // Count how many entries for each type we got in textmap.
{
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
M_TokenizerOpen((char *)textmap->data);
M_TokenizerOpen((char *)textmap->data, textmap->size);
if (!RankCapsules_TextmapCount(textmap->size))
{
M_TokenizerClose();

4
src/m_misc.cpp
View file

@ -2276,7 +2276,7 @@ static UINT32 tokenizerInputLength = 0;
static UINT8 tokenizerInComment = 0; // 0 = not in comment, 1 = // Single-line, 2 = /* Multi-line */
static boolean tokenizerIsString = false; // did we strip quotes from this token?
void M_TokenizerOpen(const char *inputString)
void M_TokenizerOpen(const char *inputString, size_t inputLength)
{
size_t i;
@ -2286,7 +2286,7 @@ void M_TokenizerOpen(const char *inputString)
tokenCapacity[i] = 1024;
tokenizerToken[i] = (char*)Z_Malloc(tokenCapacity[i] * sizeof(char), PU_STATIC, NULL);
}
tokenizerInputLength = strlen(tokenizerInput);
tokenizerInputLength = inputLength;
}
void M_TokenizerClose(void)

2
src/p_setup.cpp
View file

@ -3459,7 +3459,7 @@ static boolean P_LoadMapData(const virtres_t *virt)
if (udmf) // Count how many entries for each type we got in textmap.
{
virtlump_t *textmap = vres_Find(virt, "TEXTMAP");
M_TokenizerOpen((char *)textmap->data);
M_TokenizerOpen((char *)textmap->data, textmap->size);
if (!TextmapCount(textmap->size))
{
M_TokenizerClose();