Browse Source

Merge branch 'master' into v2.1

Mike Pall 8 years ago
parent
commit
6259c0b909
1 changed files with 2 additions and 0 deletions
  1. 2 0
      src/lj_record.c

+ 2 - 0
src/lj_record.c

@@ -731,6 +731,8 @@ void lj_record_call(jit_State *J, BCReg func, ptrdiff_t nargs)
   J->framedepth++;
   J->base += func+1+LJ_FR2;
   J->baseslot += func+1+LJ_FR2;
+  if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
+    lj_trace_err(J, LJ_TRERR_STACKOV);
 }
 
 /* Record tail call. */