zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-19 18:50:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix pointer math in FileSystem to stop debug assertions in std::vector

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-09-10 22:43:50 -03:00 committed by Rachael Alexanderson
parent a44f7a72ca
commit 0243efd851
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/common/filesystem/source/filesystem.cpp
View file

@ -981,13 +981,16 @@ int FileSystem::FindLump (const char *name, int *lastlump, bool anyns)
char name8[8]; char name8[8];
uint64_t qname; uint64_t qname;
}; };
LumpRecord *lump_p;
UpperCopy (name8, name); UpperCopy (name8, name);
assert(lastlump != NULL && *lastlump >= 0); assert(lastlump != NULL && *lastlump >= 0);
lump_p = &FileInfo[*lastlump];
while (lump_p <= &FileInfo.back()) const LumpRecord * last = FileInfo.data() + FileInfo.size();
LumpRecord * lump_p = FileInfo.data() + *lastlump;
while (lump_p < last)
{ {
if ((anyns || lump_p->Namespace == ns_global) && lump_p->shortName.qword == qname) if ((anyns || lump_p->Namespace == ns_global) && lump_p->shortName.qword == qname)
{ {
@ -1013,11 +1016,13 @@ int FileSystem::FindLump (const char *name, int *lastlump, bool anyns)
int FileSystem::FindLumpMulti (const char **names, int *lastlump, bool anyns, int *nameindex) int FileSystem::FindLumpMulti (const char **names, int *lastlump, bool anyns, int *nameindex)
{ {
LumpRecord *lump_p;
assert(lastlump != NULL && *lastlump >= 0); assert(lastlump != NULL && *lastlump >= 0);
lump_p = &FileInfo[*lastlump];
while (lump_p <= &FileInfo.back()) const LumpRecord * last = FileInfo.data() + FileInfo.size();
LumpRecord * lump_p = FileInfo.data() + *lastlump;
while (lump_p < last)
{ {
if (anyns || lump_p->Namespace == ns_global) if (anyns || lump_p->Namespace == ns_global)
{ {
@ -1052,11 +1057,14 @@ int FileSystem::FindLumpMulti (const char **names, int *lastlump, bool anyns, in
int FileSystem::FindLumpFullName(const char* name, int* lastlump, bool noext) int FileSystem::FindLumpFullName(const char* name, int* lastlump, bool noext)
{ {
assert(lastlump != NULL && *lastlump >= 0); assert(lastlump != NULL && *lastlump >= 0);
auto lump_p = &FileInfo[*lastlump];
const LumpRecord * last = FileInfo.data() + FileInfo.size();
LumpRecord * lump_p = FileInfo.data() + *lastlump;
if (!noext) if (!noext)
{ {
while (lump_p <= &FileInfo.back()) while (lump_p < last)
{ {
if (!stricmp(name, lump_p->LongName)) if (!stricmp(name, lump_p->LongName))
{ {