edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed behaviour for standard maps, added a nullptr check

Browse source
This commit is contained in:
KillaBilla 2015-06-19 00:59:27 +02:00 committed by oy
parent 52da970427
commit 008c50d429
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/engine/shared/mapchecker.cpp
View file

@ -48,13 +48,18 @@ void CMapChecker::AddMaplist(CMapVersion *pMaplist, int Num)
bool CMapChecker::IsMapValid(const char *pMapName, unsigned MapCrc, unsigned MapSize) bool CMapChecker::IsMapValid(const char *pMapName, unsigned MapCrc, unsigned MapSize)
{ {
bool StandardMap = false;
for(CWhitelistEntry *pCurrent = m_pFirst; pCurrent; pCurrent = pCurrent->m_pNext) for(CWhitelistEntry *pCurrent = m_pFirst; pCurrent; pCurrent = pCurrent->m_pNext)
{ {
if(str_comp(pCurrent->m_aMapName, pMapName) == 0 && pCurrent->m_MapCrc == MapCrc && pCurrent->m_MapSize == MapSize) if(str_comp(pCurrent->m_aMapName, pMapName) == 0)
return true; {
StandardMap = true;
if(pCurrent->m_MapCrc == MapCrc && pCurrent->m_MapSize == MapSize)
return true;
}
} }
return false; return !StandardMap;
} }
bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename, int StorageType, char *pBuffer, int BufferSize) bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename, int StorageType, char *pBuffer, int BufferSize)
@ -62,8 +67,10 @@ bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename,
// extract map name // extract map name
char aMapName[MAX_MAP_LENGTH]; char aMapName[MAX_MAP_LENGTH];
char aMapNameExt[MAX_MAP_LENGTH+4]; char aMapNameExt[MAX_MAP_LENGTH+4];
bool StandardMap = false;
const char *pExtractedName = pFilename; const char *pExtractedName = pFilename;
const char *pEnd = 0; const char *pEnd = 0;
for(const char *pSrc = pFilename; *pSrc; ++pSrc) for(const char *pSrc = pFilename; *pSrc; ++pSrc)
{ {
if(*pSrc == '/' || *pSrc == '\\') if(*pSrc == '/' || *pSrc == '\\')
@ -71,6 +78,7 @@ bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename,
else if(*pSrc == '.') else if(*pSrc == '.')
pEnd = pSrc; pEnd = pSrc;
} }
int Length = (int)(pEnd - pExtractedName); int Length = (int)(pEnd - pExtractedName);
if(Length <= 0 || Length >= MAX_MAP_LENGTH) if(Length <= 0 || Length >= MAX_MAP_LENGTH)
return true; return true;
@ -82,6 +90,7 @@ bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename,
{ {
if(str_comp(pCurrent->m_aMapName, aMapName) == 0) if(str_comp(pCurrent->m_aMapName, aMapName) == 0)
{ {
StandardMap = true;
char aBuffer[512]; // TODO: MAX_PATH_LENGTH (512) should be defined in a more central header and not in storage.cpp and editor.h char aBuffer[512]; // TODO: MAX_PATH_LENGTH (512) should be defined in a more central header and not in storage.cpp and editor.h
bool CrcSizeMatch = false; bool CrcSizeMatch = false;
if(!pStorage->FindFile(aMapNameExt, "maps", StorageType, aBuffer, sizeof(aBuffer), pCurrent->m_MapCrc, pCurrent->m_MapSize, &CrcSizeMatch)) if(!pStorage->FindFile(aMapNameExt, "maps", StorageType, aBuffer, sizeof(aBuffer), pCurrent->m_MapCrc, pCurrent->m_MapSize, &CrcSizeMatch))
@ -95,5 +104,5 @@ bool CMapChecker::ReadAndValidateMap(IStorage *pStorage, const char *pFilename,
} }
} }
return false; return !StandardMap;
} }

3
src/engine/shared/storage.cpp
View file

@ -373,7 +373,8 @@ public:
return false; return false;
pBuffer[0] = 0; pBuffer[0] = 0;
*pCrcSizeMatch = false; if(pCrcSizeMatch != 0)
*pCrcSizeMatch = false;
char aBuf[MAX_PATH_LENGTH]; char aBuf[MAX_PATH_LENGTH];
CFindCBData Data; CFindCBData Data;