diff options
| author | Mike Pall <mike> | 2017-05-17 17:38:53 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2017-05-17 17:38:53 +0200 |
| commit | 6259c0b909a8c00fabe3c7e6bd81150ee08cbf9f (patch) | |
| tree | 882868f4ef5760645e018b46318c7c83a0ad8a8e /src | |
| parent | 31afda31814ec02f82ffb0519bee496c87eeaa89 (diff) | |
| parent | 630ff3196a06353c6a7ccd1e9ac3958f4a8ca13c (diff) | |
| download | luajit-6259c0b909a8c00fabe3c7e6bd81150ee08cbf9f.tar.gz luajit-6259c0b909a8c00fabe3c7e6bd81150ee08cbf9f.tar.bz2 luajit-6259c0b909a8c00fabe3c7e6bd81150ee08cbf9f.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to '')
| -rw-r--r-- | src/lj_record.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lj_record.c b/src/lj_record.c index c2d02745..1a2b1c5d 100644 --- 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) | |||
| 731 | J->framedepth++; | 731 | J->framedepth++; |
| 732 | J->base += func+1+LJ_FR2; | 732 | J->base += func+1+LJ_FR2; |
| 733 | J->baseslot += func+1+LJ_FR2; | 733 | J->baseslot += func+1+LJ_FR2; |
| 734 | if (J->baseslot + J->maxslot >= LJ_MAX_JSLOTS) | ||
| 735 | lj_trace_err(J, LJ_TRERR_STACKOV); | ||
| 734 | } | 736 | } |
| 735 | 737 | ||
| 736 | /* Record tail call. */ | 738 | /* Record tail call. */ |