diff --git a/SOURCES/lua-5.4.1-bug11.patch b/SOURCES/lua-5.4.1-bug11.patch new file mode 100644 index 0000000..e48a385 --- /dev/null +++ b/SOURCES/lua-5.4.1-bug11.patch @@ -0,0 +1,30 @@ +From a585eae6e7ada1ca9271607a4f48dfb17868ab7b Mon Sep 17 00:00:00 2001 +From: Roberto Ierusalimschy +Date: Mon, 27 Jul 2020 12:01:38 -0300 +Subject: [PATCH] Fixed bug: Negation overflow in getlocal/setlocal + +Adjusted for 5.3 + +--- +diff --git a/src/ldebug.c b/src/ldebug.c +index f1835890..a44e5439 100644 +--- a/src/ldebug.c ++++ b/src/ldebug.c +@@ -133,7 +133,7 @@ static const char *upvalname (Proto *p, int uv) { + + static const char *findvararg (CallInfo *ci, int n, StkId *pos) { + int nparams = clLvalue(ci->func)->p->numparams; +- if (n >= cast_int(ci->u.l.base - ci->func) - nparams) ++ if (n < cast_int(ci->u.l.base - ci->func) - nparams) /* 'n' is negative */ + return NULL; /* no such vararg */ + else { + *pos = ci->func + nparams + n; +@@ -148,7 +148,7 @@ static const char *findlocal (lua_State *L, CallInfo *ci, int n, + StkId base; + if (isLua(ci)) { + if (n < 0) /* access to vararg values? */ +- return findvararg(ci, -n, pos); ++ return findvararg(ci, n, pos); + else { + base = ci->u.l.base; + name = luaF_getlocalname(ci_func(ci)->p, n, currentpc(ci)); diff --git a/SPECS/lua.spec b/SPECS/lua.spec index a6420e7..c899ba3 100644 --- a/SPECS/lua.spec +++ b/SPECS/lua.spec @@ -12,7 +12,7 @@ Name: lua Version: %{major_version}.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Powerful light-weight programming language Group: Development/Languages License: MIT @@ -45,6 +45,7 @@ Patch10: lua-5.3.4-bug4.patch Patch11: lua-5.3.4-bug5.patch Patch12: lua-5.3.4-bug6.patch Patch13: lua-5-3.4-upvaluejoin.patch +Patch14: lua-5.4.1-bug11.patch BuildRequires: automake autoconf libtool readline-devel ncurses-devel Requires: lua-libs = %{version}-%{release} @@ -102,6 +103,7 @@ mv src/luaconf.h src/luaconf.h.template.in %patch11 -p1 -b .bug5 %patch12 -p1 -b .bug6 %patch13 -p1 -b .upvaluejoin +%patch14 -p1 -b .bug11 # Put proper version in configure.ac, patch0 hardcodes 5.3.0 sed -i 's|5.3.0|%{version}|g' configure.ac autoreconf -ifv @@ -224,6 +226,9 @@ install -Dpm 0644 %{SOURCE1000} $RPM_BUILD_ROOT/%{macrosdir}/macros.lua %changelog +* Mon Aug 02 2019 Florian Festi - 5.3.4-12 +- Fix segfault in getlocal and setlocal (#1880445) + * Mon Jun 03 2019 Florian Festi - 5.3.4-11 - Fix use after free in lua_upvaluejoin (#1670167)