Merge branch 'master' into v2.1

2019-12-08 19:50:36 +01:00
parent 05898a8824 de48d00094
commit 1d9a337de6
7 changed files with 16 additions and 13 deletions
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1860,6 +1860,8 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
      lj_trace_err_info(J, LJ_TRERR_NYIBC);
    }
  }
+  if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS)
+    lj_trace_err(J, LJ_TRERR_STACKOV);
 }

 /* -- Record allocations -------------------------------------------------- */