mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-20 19:02:41 +01:00
Code Issues Releases Wiki Activity

Fix: [Script] Check if array sort function modified array.

Browse Source 
Do not allow a script to add or remove elements.
This commit is contained in:
Peter Nelson
2026-01-14 01:43:35 +00:00
committed by Peter Nelson
parent 5e4af50768
commit 7933b0417d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/3rdparty/squirrel/squirrel/sqbaselib.cpp vendored
View File

@@ -519,6 +519,7 @@ bool _sort_compare(HSQUIRRELVM v,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQ
bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bottom, SQInteger func)
{
SQInteger initial_size = arr->Size();
SQInteger maxChild;
SQInteger done = 0;
SQInteger ret;
@@ -531,6 +532,10 @@ bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bott
else {
if(!_sort_compare(v,arr->_values[root2],arr->_values[root2 + 1],func,ret))
return false;
if (initial_size != arr->Size()) {
v->Raise_Error("compare function modified array");
return false;
}
if (ret > 0) {
maxChild = root2;
}
@@ -542,6 +547,10 @@ bool _hsort_sift_down(HSQUIRRELVM v,SQArray *arr, SQInteger root, SQInteger bott
if(!_sort_compare(v,arr->_values[root],arr->_values[maxChild],func,ret))
return false;
if (initial_size != arr->Size()) {
v->Raise_Error("compare function modified array");
return false;
}
if (ret < 0) {
if (root == maxChild) {
v->Raise_Error("inconsistent compare function");