fix Flat loading code passing non null terminated strings to W_CheckNumForName
This commit is contained in:
1 parent
834a94e429
commit
bebe62346f
2 files changed
+6
-4
No files matched your search
+4
-4
@@ -680,11 +680,11 @@ INT32 P_AddLevelFlat(const char *flatname, levelflat_t *levelflat)
|
||||
if (i == numlevelflats)
|
||||
{
|
||||
// store the name
|
||||
strlcpy(levelflat->name, flatname, sizeof (levelflat->name));
|
||||
strlcpy(levelflat->name, flatname, sizeof(levelflat->name));
|
||||
strupr(levelflat->name);
|
||||
|
||||
// store the flat lump number
|
||||
levelflat->lumpnum = R_GetFlatNumForName(flatname);
|
||||
levelflat->lumpnum = R_GetFlatNumForName(levelflat->name);
|
||||
levelflat->baselumpnum = LUMPERROR;
|
||||
|
||||
P_CheckCyanFlat(levelflat);
|
||||
@@ -727,11 +727,11 @@ INT32 P_AddLevelFlatRuntime(const char *flatname)
|
||||
levelflat = levelflats+i;
|
||||
|
||||
// store the name
|
||||
strlcpy(levelflat->name, flatname, sizeof (levelflat->name));
|
||||
strlcpy(levelflat->name, flatname, sizeof(levelflat->name));
|
||||
strupr(levelflat->name);
|
||||
|
||||
// store the flat lump number
|
||||
levelflat->lumpnum = R_GetFlatNumForName(flatname);
|
||||
levelflat->lumpnum = R_GetFlatNumForName(levelflat->name);
|
||||
levelflat->baselumpnum = LUMPERROR;
|
||||
|
||||
P_CheckCyanFlat(levelflat);
|
||||
|
||||
@@ -254,7 +254,9 @@ void P_InitPicAnims(void)
|
||||
{
|
||||
memcpy(&(animdefs[i].istexture), currentPos, 1); // istexture, 1 byte
|
||||
memcpy(animdefs[i].endname, (currentPos + 1), 9); // endname, 9 bytes
|
||||
animdefs[i].endname[8] = '\0';
|
||||
memcpy(animdefs[i].startname, (currentPos + 10), 9); // startname, 9 bytes
|
||||
animdefs[i].startname[8] = '\0';
|
||||
memcpy(&(animdefs[i].speed), (currentPos + 19), 4); // speed, 4 bytes
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user