diff options
author | Mike Pall <mike> | 2018-01-29 13:19:30 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2018-01-29 13:19:30 +0100 |
commit | 0bf46e1edf94c43795b5e491efe682ab70974ce7 (patch) | |
tree | 5e96ce2da5161ebd49fb564fe5aa73805b3391b7 /src/lj_err.c | |
parent | 74c544d68c07bcd416225598cdf15f88e62fd457 (diff) | |
parent | d4ee80342770d1281e2ce877f8ae8ab1d99e6528 (diff) | |
download | luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.tar.gz luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.tar.bz2 luajit-0bf46e1edf94c43795b5e491efe682ab70974ce7.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_err.c')
-rw-r--r-- | src/lj_err.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_err.c b/src/lj_err.c index b6be357e..abf176e5 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
@@ -150,6 +150,7 @@ static void *err_unwind(lua_State *L, void *stopcf, int errcode) | |||
150 | case FRAME_CONT: /* Continuation frame. */ | 150 | case FRAME_CONT: /* Continuation frame. */ |
151 | if (frame_iscont_fficb(frame)) | 151 | if (frame_iscont_fficb(frame)) |
152 | goto unwind_c; | 152 | goto unwind_c; |
153 | /* fallthrough */ | ||
153 | case FRAME_VARG: /* Vararg frame. */ | 154 | case FRAME_VARG: /* Vararg frame. */ |
154 | frame = frame_prevd(frame); | 155 | frame = frame_prevd(frame); |
155 | break; | 156 | break; |