Remove two more upstreamed patches

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=73
This commit is contained in:
Matej Cepl 2023-05-01 17:41:55 +00:00 committed by Git OBS Bridge
parent ce441f7720
commit e780e2d22c
4 changed files with 3 additions and 49 deletions

View File

@ -10,6 +10,8 @@ Sun Apr 30 12:22:03 UTC 2023 - Matej Cepl <mcepl@suse.com>
- luabugs10.patch
- luabugs11.patch
- luabugs2.patch
- luabugs4.patch
- luabugs5.patch
- luabugs6.patch
- luabugs7.patch
- luabugs8.patch

View File

@ -45,9 +45,7 @@ Patch2: files_test.patch
Patch3: main_test.patch
Patch6: shared_link.patch
# PATCH-FIX-UPSTREAM luabugsX.patch https://www.lua.org/bugs.html#5.4.4-X
Patch9: luabugs3.patch
Patch10: luabugs4.patch
Patch11: luabugs5.patch
# Patch9: luabugs3.patch
#
%if "%{flavor}" == "test"
BuildRequires: lua54

View File

@ -1,27 +0,0 @@
From 42d40581dd919fb134c07027ca1ce0844c670daf Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 20 May 2022 13:14:33 -0300
Subject: [PATCH] Save stack space while handling errors
Because error handling (luaG_errormsg) uses slots from EXTRA_STACK,
and some errors can recur (e.g., string overflow while creating an
error message in 'luaG_runerror', or a C-stack overflow before calling
the message handler), the code should use stack slots with parsimony.
This commit fixes the bug "Lua-stack overflow when C stack overflows
while handling an error".
---
src/lvm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/lvm.c
+++ b/src/lvm.c
@@ -674,7 +674,7 @@ void luaV_concat (lua_State *L, int tota
setsvalue2s(L, top - n, ts); /* create result */
}
total -= n - 1; /* got 'n' strings to create one new */
- L->top.p -= n - 1; /* popped 'n' strings and pushed one */
+ L->top = top - (n - 1); /* popped 'n' strings and pushed one */
} while (total > 1); /* repeat until only 1 result left */
}

View File

@ -1,19 +0,0 @@
From 196bb94d66e727e0aec053a0276c3ad701500762 Mon Sep 17 00:00:00 2001
From: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Wed, 25 May 2022 17:41:39 -0300
Subject: [PATCH] Bug: 'lua_settop' may use an invalid pointer to stack
---
src/lfunc.c | 1 +
1 file changed, 1 insertion(+)
--- a/src/lfunc.c
+++ b/src/lfunc.c
@@ -204,6 +204,7 @@ void luaF_closeupval (lua_State *L, StkI
luaC_barrier(L, uv, slot);
}
}
+ return level;
}