Merge branch 'master' into v2.1

eugeneia · May 17, 2017 · 6259c0b · 6259c0b
2 parents 31afda3 + 630ff31
commit 6259c0b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/lj_record.c b/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. */