mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Check max member count in squirrel classes (#10883) 

Manual cherry-pick from 23a0620658
pull/10888/head
Loïc Guilloux 2023-05-27 18:09:21 +02:00 committed by GitHub
parent 8ea9c1a133
commit c880157518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/3rdparty/squirrel/squirrel/sqclass.cpp vendored
View File

@ -65,6 +65,9 @@ bool SQClass::NewSlot(SQSharedState *ss,const SQObjectPtr &key,const SQObjectPtr
_defaultvalues[_member_idx(temp)].val = val; _defaultvalues[_member_idx(temp)].val = val;
return true; return true;
} }
if (_members->CountUsed() >= MEMBER_MAX_COUNT) {
return false;
}
if(type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic) { if(type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE || bstatic) {
SQInteger mmidx; SQInteger mmidx;
if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) && if((type(val) == OT_CLOSURE || type(val) == OT_NATIVECLOSURE) &&

1
src/3rdparty/squirrel/squirrel/sqclass.h vendored
View File

@ -19,6 +19,7 @@ typedef sqvector<SQClassMember> SQClassMemberVec;
#define MEMBER_TYPE_METHOD 0x01000000 #define MEMBER_TYPE_METHOD 0x01000000
#define MEMBER_TYPE_FIELD 0x02000000 #define MEMBER_TYPE_FIELD 0x02000000
#define MEMBER_MAX_COUNT 0x00FFFFFF
#define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD) #define _ismethod(o) (_integer(o)&MEMBER_TYPE_METHOD)
#define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD) #define _isfield(o) (_integer(o)&MEMBER_TYPE_FIELD)