Merge branch 'master' into v2.1

eugeneia · Aug 13, 2017 · 07918dc · 07918dc
1 parent a0a1983
commit 07918dc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/lj_record.c b/src/lj_record.c
@@ -652,6 +652,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. */