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

Merge #1592

Browse source 
1592: Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as … r=def- a=ChillerDragon

…an array. Should fix https://github.com/teeworlds/teeworlds/issues/2073

(cherry picked from commit e086f4b35b)

Co-authored-by: Jordy Ruiz <jordy.ruiz@univ-lille.fr>
This commit is contained in:
bors[bot] 2019-04-07 11:28:44 +00:00
parent ad4c13b115 1e0cc51ba1
commit 79a6ae6ae9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/engine/shared/datafile.cpp
View file

@ -314,6 +314,9 @@ void *CDataFileReader::GetDataImpl(int Index, int Swap)
{
if(!m_pDataFile) { return 0; }
if(Index < 0 || Index >= m_pDataFile->m_Header.m_NumRawData)
return 0;
// load it if needed
if(!m_pDataFile->m_ppDataPtrs[Index])
{
@ -377,7 +380,7 @@ void *CDataFileReader::GetDataSwapped(int Index)
void CDataFileReader::UnloadData(int Index)
{
if(Index < 0)
if(Index < 0 || Index >= m_pDataFile->m_Header.m_NumRawData)
return;
//