diff options
| author | Mike Pall <mike> | 2020-07-12 14:33:01 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-07-12 14:33:01 +0200 |
| commit | 6097795367db86cd01ec9dccd13f8bffc16df580 (patch) | |
| tree | d8ea120a028c26dbd70b9f5e4495d78480bcfee8 /src | |
| parent | 384d6d56f4a3841fdef607a511dda92a579af2ff (diff) | |
| parent | 53f82e6e2e858a0a62fd1a2ff47e9866693382e6 (diff) | |
| download | luajit-6097795367db86cd01ec9dccd13f8bffc16df580.tar.gz luajit-6097795367db86cd01ec9dccd13f8bffc16df580.tar.bz2 luajit-6097795367db86cd01ec9dccd13f8bffc16df580.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -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 39339b10..3de19a0b 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -581,6 +581,7 @@ static ptrdiff_t finderrfunc(lua_State *L) | |||
| 581 | if (cframe_canyield(cf)) return 0; | 581 | if (cframe_canyield(cf)) return 0; |
| 582 | if (cframe_errfunc(cf) >= 0) | 582 | if (cframe_errfunc(cf) >= 0) |
| 583 | return cframe_errfunc(cf); | 583 | return cframe_errfunc(cf); |
| 584 | cf = cframe_prev(cf); | ||
| 584 | frame = frame_prevd(frame); | 585 | frame = frame_prevd(frame); |
| 585 | break; | 586 | break; |
| 586 | case FRAME_PCALL: | 587 | case FRAME_PCALL: |