diff options
| author | Mike Pall <mike> | 2024-08-15 00:17:19 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2024-08-15 00:17:19 +0200 |
| commit | 86e7123bb1782a5f200ba5e83b8c4f3fbad4f7bc (patch) | |
| tree | 888c82fdb96028b92ec4f49c6f6efdab0895ccf3 /src/lj_trace.c | |
| parent | 7369eff67d46d7f5fac9ee064e3fbf97a15458de (diff) | |
| download | luajit-86e7123bb1782a5f200ba5e83b8c4f3fbad4f7bc.tar.gz luajit-86e7123bb1782a5f200ba5e83b8c4f3fbad4f7bc.tar.bz2 luajit-86e7123bb1782a5f200ba5e83b8c4f3fbad4f7bc.zip | |
Different fix for partial snapshot restore due to stack overflow.
Reported by Junlong Li. Fixed by Peter Cawley. #1196
Diffstat (limited to '')
| -rw-r--r-- | src/lj_trace.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lj_trace.c b/src/lj_trace.c index 8385f3d1..d015f2ab 100644 --- a/src/lj_trace.c +++ b/src/lj_trace.c | |||
| @@ -788,10 +788,8 @@ int LJ_FASTCALL lj_trace_exit(jit_State *J, void *exptr) | |||
| 788 | exd.J = J; | 788 | exd.J = J; |
| 789 | exd.exptr = exptr; | 789 | exd.exptr = exptr; |
| 790 | errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp); | 790 | errcode = lj_vm_cpcall(L, NULL, &exd, trace_exit_cp); |
| 791 | if (errcode) { | 791 | if (errcode) |
| 792 | setcframe_pc(cframe_raw(L->cframe), L); /* Point to any valid memory. */ | ||
| 793 | return -errcode; /* Return negated error code. */ | 792 | return -errcode; /* Return negated error code. */ |
| 794 | } | ||
| 795 | 793 | ||
| 796 | lj_vmevent_send(L, TEXIT, | 794 | lj_vmevent_send(L, TEXIT, |
| 797 | lj_state_checkstack(L, 4+RID_NUM_GPR+RID_NUM_FPR+LUA_MINSTACK); | 795 | lj_state_checkstack(L, 4+RID_NUM_GPR+RID_NUM_FPR+LUA_MINSTACK); |