thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-24 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

readskincolor: sizeof is compile-time evaluated, literally why do we need to run the allocator for this

Browse source
This commit is contained in:
toaster 2023-12-16 22:00:58 +00:00
parent 933faf1d9d
commit 436ba88220
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/deh_soc.c
View file

@ -577,8 +577,8 @@ void readskincolor(MYFILE *f, INT32 num)
if (fastcmp(word, "NAME"))
{
size_t namesize = sizeof(skincolors[num].name);
char *truncword = Z_Malloc(sizeof(char) * namesize, PU_STATIC, NULL);
char truncword[sizeof(skincolors[num].name)];
size_t namesize = sizeof(truncword);
UINT16 dupecheck;
deh_strlcpy(truncword, word2, namesize, va("Skincolor %d: name", num)); // truncate here to check for dupes
@ -586,7 +586,7 @@ void readskincolor(MYFILE *f, INT32 num)
if (truncword[0] != '\0' && (!stricmp(truncword, skincolors[SKINCOLOR_NONE].name) || (dupecheck && dupecheck != num)))
{
size_t lastchar = strlen(truncword);
char *oldword = Z_Calloc(sizeof(char) * (lastchar + 1), PU_STATIC, NULL);
char oldword[sizeof(truncword)];
char dupenum = '1';
strlcpy(oldword, truncword, lastchar+1);
@ -611,11 +611,9 @@ void readskincolor(MYFILE *f, INT32 num)
}
deh_warning("Skincolor %d: name %s is a duplicate of another skincolor's name - renamed to %s", num, oldword, truncword);
Z_Free(oldword);
}
strlcpy(skincolors[num].name, truncword, namesize); // already truncated
Z_Free(truncword);
}
else if (fastcmp(word, "RAMP"))
{