lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

backport string len tweaks I made to LUA_LoadLump in internal

Browse source
This commit is contained in:
Monster Iestyn 2018-11-27 23:06:31 +00:00
parent cb53bc8afe
commit e158206e55
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/lua_script.c
View file

@ -186,27 +186,30 @@ void LUA_LoadLump(UINT16 wad, UINT16 lump)
{ {
MYFILE f; MYFILE f;
char *name; char *name;
size_t len;
f.wad = wad; f.wad = wad;
f.size = W_LumpLengthPwad(wad, lump); f.size = W_LumpLengthPwad(wad, lump);
f.data = Z_Malloc(f.size, PU_LUA, NULL); f.data = Z_Malloc(f.size, PU_LUA, NULL);
W_ReadLumpPwad(wad, lump, f.data); W_ReadLumpPwad(wad, lump, f.data);
f.curpos = f.data; f.curpos = f.data;
len = strlen(wadfiles[wad]->filename); // length of file name
if (wadfiles[wad]->type == RET_LUA) if (wadfiles[wad]->type == RET_LUA)
{ {
name = malloc(strlen(wadfiles[wad]->filename)+1); name = malloc(len+1);
strcpy(name, wadfiles[wad]->filename); strcpy(name, wadfiles[wad]->filename);
} }
else // If it's not a .lua file, copy the lump name in too. else // If it's not a .lua file, copy the lump name in too.
{ {
lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump]; lumpinfo_t *lump_p = &wadfiles[wad]->lumpinfo[lump];
size_t length = strlen(wadfiles[wad]->filename) + 1 + strlen(lump_p->name2); // length of file name, '|', and lump name len += 1 + strlen(lump_p->name2); // length of file name, '|', and lump name
name = malloc(length + 1); name = malloc(len+1);
sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->name2); sprintf(name, "%s|%s", wadfiles[wad]->filename, lump_p->name2);
name[length] = '\0'; name[len] = '\0';
} }
LUA_LoadFile(&f, name); LUA_LoadFile(&f, name); // actually load file!
free(name); free(name);
Z_Free(f.data); Z_Free(f.data);