mirrors/lua
1
0
Fork 0
mirror of https://github.com/lua/lua synced 2024-12-26 20:29:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

'lcode.c' can use 'checklimit', too

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2024-08-20 15:15:23 -03:00
parent 3e88b72b8e
commit 75620b45ae
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lcode.c
View File

@ -208,8 +208,7 @@ void luaK_ret (FuncState *fs, int first, int nret) {
case 1: op = OP_RETURN1; break; case 1: op = OP_RETURN1; break;
default: op = OP_RETURN; break; default: op = OP_RETURN; break;
} }
if (nret + 1 > MAXARG_B) luaY_checklimit(fs, nret + 1, MAXARG_B, "returns");
luaX_syntaxerror(fs->ls, "too many returns");
luaK_codeABC(fs, op, first, nret + 1, 0); luaK_codeABC(fs, op, first, nret + 1, 0);
} }
@ -473,9 +472,7 @@ static int luaK_codek (FuncState *fs, int reg, int k) {
void luaK_checkstack (FuncState *fs, int n) { void luaK_checkstack (FuncState *fs, int n) {
int newstack = fs->freereg + n; int newstack = fs->freereg + n;
if (newstack > fs->f->maxstacksize) { if (newstack > fs->f->maxstacksize) {
if (newstack > MAX_FSTACK) luaY_checklimit(fs, newstack, MAX_FSTACK, "registers");
luaX_syntaxerror(fs->ls,
"function or expression needs too many registers");
fs->f->maxstacksize = cast_byte(newstack); fs->f->maxstacksize = cast_byte(newstack);
} }
} }
@ -727,8 +724,7 @@ static void const2exp (TValue *v, expdesc *e) {
*/ */
void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) { void luaK_setreturns (FuncState *fs, expdesc *e, int nresults) {
Instruction *pc = &getinstruction(fs, e); Instruction *pc = &getinstruction(fs, e);
if (nresults + 1 > MAXARG_C) luaY_checklimit(fs, nresults + 1, MAXARG_C, "multiple results");
luaX_syntaxerror(fs->ls, "too many multiple results");
if (e->k == VCALL) /* expression is an open function call? */ if (e->k == VCALL) /* expression is an open function call? */
SETARG_C(*pc, nresults + 1); SETARG_C(*pc, nresults + 1);
else { else {

10
lparser.c
View File

@ -84,8 +84,8 @@ static l_noret errorlimit (FuncState *fs, int limit, const char *what) {
} }
static void checklimit (FuncState *fs, int v, int l, const char *what) { void luaY_checklimit (FuncState *fs, int v, int l, const char *what) {
if (v > l) errorlimit(fs, l, what); if (l_unlikely(v > l)) errorlimit(fs, l, what);
} }
@ -196,7 +196,7 @@ static int new_localvarkind (LexState *ls, TString *name, lu_byte kind) {
FuncState *fs = ls->fs; FuncState *fs = ls->fs;
Dyndata *dyd = ls->dyd; Dyndata *dyd = ls->dyd;
Vardesc *var; Vardesc *var;
checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal, luaY_checklimit(fs, dyd->actvar.n + 1 - fs->firstlocal,
MAXVARS, "local variables"); MAXVARS, "local variables");
luaM_growvector(L, dyd->actvar.arr, dyd->actvar.n + 1, luaM_growvector(L, dyd->actvar.arr, dyd->actvar.n + 1,
dyd->actvar.size, Vardesc, USHRT_MAX, "local variables"); dyd->actvar.size, Vardesc, USHRT_MAX, "local variables");
@ -361,7 +361,7 @@ static int searchupvalue (FuncState *fs, TString *name) {
static Upvaldesc *allocupvalue (FuncState *fs) { static Upvaldesc *allocupvalue (FuncState *fs) {
Proto *f = fs->f; Proto *f = fs->f;
int oldsize = f->sizeupvalues; int oldsize = f->sizeupvalues;
checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues"); luaY_checklimit(fs, fs->nups + 1, MAXUPVAL, "upvalues");
luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues, luaM_growvector(fs->ls->L, f->upvalues, fs->nups, f->sizeupvalues,
Upvaldesc, MAXUPVAL, "upvalues"); Upvaldesc, MAXUPVAL, "upvalues");
while (oldsize < f->sizeupvalues) while (oldsize < f->sizeupvalues)
@ -860,7 +860,7 @@ static void recfield (LexState *ls, ConsControl *cc) {
lu_byte reg = ls->fs->freereg; lu_byte reg = ls->fs->freereg;
expdesc tab, key, val; expdesc tab, key, val;
if (ls->t.token == TK_NAME) { if (ls->t.token == TK_NAME) {
checklimit(fs, cc->nh, INT_MAX, "items in a constructor"); luaY_checklimit(fs, cc->nh, INT_MAX / 2, "items in a constructor");
codename(ls, &key); codename(ls, &key);
} }
else /* ls->t.token == '[' */ else /* ls->t.token == '[' */

2
lparser.h
View File

@ -164,6 +164,8 @@ typedef struct FuncState {
LUAI_FUNC lu_byte luaY_nvarstack (FuncState *fs); LUAI_FUNC lu_byte luaY_nvarstack (FuncState *fs);
LUAI_FUNC void luaY_checklimit (FuncState *fs, int v, int l,
const char *what);
LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff, LUAI_FUNC LClosure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
Dyndata *dyd, const char *name, int firstchar); Dyndata *dyd, const char *name, int firstchar);