diff options
| author | Mike Pall <mike> | 2022-11-09 11:06:11 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-11-09 11:06:11 +0100 |
| commit | 7a0cf5fd4c6c841d0455a51271af4fd4390c7884 (patch) | |
| tree | 053cbfb14435be33a7941723f0bc6fbf459cc5eb /src | |
| parent | 6c4826f12c4d33b8b978004bc681eb1eef2be977 (diff) | |
| parent | ca8d3257bb44e42100c7910c47dcdcf01f494187 (diff) | |
| download | luajit-7a0cf5fd4c6c841d0455a51271af4fd4390c7884.tar.gz luajit-7a0cf5fd4c6c841d0455a51271af4fd4390c7884.tar.bz2 luajit-7a0cf5fd4c6c841d0455a51271af4fd4390c7884.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to '')
| -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 563c7706..283c3d18 100644 --- a/src/lj_err.c +++ b/src/lj_err.c | |||
| @@ -777,6 +777,7 @@ LJ_NOINLINE void lj_err_mem(lua_State *L) | |||
| 777 | { | 777 | { |
| 778 | if (L->status == LUA_ERRERR+1) /* Don't touch the stack during lua_open. */ | 778 | if (L->status == LUA_ERRERR+1) /* Don't touch the stack during lua_open. */ |
| 779 | lj_vm_unwind_c(L->cframe, LUA_ERRMEM); | 779 | lj_vm_unwind_c(L->cframe, LUA_ERRMEM); |
| 780 | if (curr_funcisL(L)) L->top = curr_topL(L); | ||
| 780 | setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM)); | 781 | setstrV(L, L->top++, lj_err_str(L, LJ_ERR_ERRMEM)); |
| 781 | lj_err_throw(L, LUA_ERRMEM); | 782 | lj_err_throw(L, LUA_ERRMEM); |
| 782 | } | 783 | } |