Merge branch 'master' into v2.1

Mike Pall · Mike Pall · commit 46a6d06dc57a · 2020-08-09T18:19:19.000+02:00
diff --git a/src/lj_trace.c b/src/lj_trace.c
@@ -790,6 +790,8 @@ static TValue *trace_exit_cp(lua_State *L, lua_CFunction dummy, void *ud)
 {
   ExitDataCP *exd = (ExitDataCP *)ud;
   cframe_errfunc(L->cframe) = -1;  /* Inherit error function. */
+  /* Always catch error here. */
+  cframe_nres(L->cframe) = -2*LUAI_MAXSTACK*(int)sizeof(TValue);
   exd->pc = lj_snap_restore(exd->J, exd->exptr);
   UNUSED(dummy);
   return NULL;

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,8 @@ static TValue trace_exit_cp(lua_State L, lua_CFunction dummy, void *ud)`
`790`	`790`	`{`
`791`	`791`	`ExitDataCP exd = (ExitDataCP )ud;`
`792`	`792`	`cframe_errfunc(L->cframe) = -1; /* Inherit error function. */`
	`793`	`+ /* Always catch error here. */`
	`794`	`+ cframe_nres(L->cframe) = -2LUAI_MAXSTACK(int)sizeof(TValue);`
`793`	`795`	`exd->pc = lj_snap_restore(exd->J, exd->exptr);`
`794`	`796`	`UNUSED(dummy);`
`795`	`797`	`return NULL;`