From 9d777346bc4e3b033dd78393980d41ee7bc34867 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 13 Jan 2025 16:16:27 +0100
Subject: [PATCH 1/2] Reject negative getfenv()/setfenv() levels to prevent
 compiler warning.

Thanks to Sergey Kaplun. #1329
---
 src/lib_base.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/lib_base.c b/src/lib_base.c
index 5190f3fe..7683163c 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -141,6 +141,8 @@ LJLIB_CF(getfenv)
   cTValue *o = L->base;
   if (!(o < L->top && tvisfunc(o))) {
     int level = lj_lib_optint(L, 1, 1);
+    if (level < 0)
+      lj_err_arg(L, 1, LJ_ERR_INVLVL);
     o = lj_debug_frame(L, level, &level);
     if (o == NULL)
       lj_err_arg(L, 1, LJ_ERR_INVLVL);
@@ -162,6 +164,8 @@ LJLIB_CF(setfenv)
       setgcref(L->env, obj2gco(t));
       return 0;
     }
+    if (level < 0)
+      lj_err_arg(L, 1, LJ_ERR_INVLVL);
     o = lj_debug_frame(L, level, &level);
     if (o == NULL)
       lj_err_arg(L, 1, LJ_ERR_INVLVL);

From 62e362afbb1d100c892d2782c5862ad18bc464f2 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Mon, 13 Jan 2025 16:19:57 +0100
Subject: [PATCH 2/2] Fix recording of BC_VARG.

Reported by Bachir Bendrissou.
---
 src/lj_record.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lj_record.c b/src/lj_record.c
index 9e0f3501..20a7ea36 100644
--- a/src/lj_record.c
+++ b/src/lj_record.c
@@ -1570,7 +1570,7 @@ static void rec_varg(jit_State *J, BCReg dst, ptrdiff_t nresults)
 	J->maxslot = dst + (BCReg)nresults;
       }
     } else if (select_detect(J)) {  /* y = select(x, ...) */
-      TRef tridx = J->base[dst-1];
+      TRef tridx = getslot(J, dst-1);
       TRef tr = TREF_NIL;
       ptrdiff_t idx = lj_ffrecord_select_mode(J, tridx, &J->L->base[dst-1]);
       if (idx < 0) goto nyivarg;