libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: LINGO: Added helper macro for array bounds check

Browse Source
This commit is contained in:
Eugene Sandulenko 2020-04-18 13:32:37 +02:00
parent 94b7e15d72
commit ac1220c16e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/director/lingo/lingo-builtins.cpp
View File

@ -52,6 +52,12 @@ namespace Director {
return; \
}
#define ARRBOUNDSCHECK(idx,array) \
if ((idx)-1 < 0 || (idx) > (array).u.farr->size()) { \
warning("%s: index out of bounds (%d of %d)", __FUNCTION__, (idx), (array).u.farr->size()); \
return; \
}
static struct BuiltinProto {
const char *name;
void (*func)(int);
@ -645,11 +651,7 @@ void LB::b_getAt(int nargs) {
TYPECHECK(index, INT);
TYPECHECK(list, ARRAY);
if (index.u.i-1 < 0 || index.u.i > list.u.farr->size()){
warning("b_getAt: index %s out of bounds", index.type2str());
return;
}
ARRBOUNDSCHECK(index.u.i, list);
Datum result = list.u.farr->operator[](index.u.i-1);
g_lingo->push(result);