From 07918dc7b9d684af672361db4a312e0a53a899b6 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Wed, 17 May 2017 17:38:53 +0200
Subject: [PATCH] Merge branch 'master' into v2.1

---
 src/lj_record.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lj_record.c b/src/lj_record.c
index 3667f91c8b..cce8cf34e0 100644
--- 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. */