UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix DataPack Overwrite Regression (#862)

Browse Source 
Some tests passed with the implementation prior to this commit, but those were edge cases. Good older behavior is now fully restored
This commit is contained in:
Michael Flaherty 2018-08-11 05:31:33 -07:00 committed by Asher Baker
parent 7e3b1c395b
commit a65c215217
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/logic/CDataPack.cpp
View File

@ -219,12 +219,16 @@ bool CDataPack::RemoveItem(size_t pos)
{ {
pos = position; pos = position;
} }
if (pos >= elements.length()) if (pos >= elements.length())
{ {
return false; return false;
} }
if (pos < position) // we're deleting under us, step back
{
--position;
}
switch (elements[pos].type) switch (elements[pos].type)
{ {
case CDataPackType::Raw: case CDataPackType::Raw:
@ -241,6 +245,5 @@ bool CDataPack::RemoveItem(size_t pos)
} }
elements.remove(pos); elements.remove(pos);
--position;
return true; return true;
} }