From 8fb7864a59823053112448982bb9b65adbca9d40212857c39d2f3955d53b5646 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Fri, 21 Aug 2020 18:31:00 +0000
Subject: [PATCH] Accepting request 828559 from home:gmbr3:Lua

- Add final part of patch for CVE-2020-15888, boo#1174367
- Add upstream patch 13

OBS-URL: https://build.opensuse.org/request/show/828559
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=13
---
 lua54.changes       |  6 ++++++
 upstream-bugs.patch | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/lua54.changes b/lua54.changes
index b5023df..7001c4c 100644
--- a/lua54.changes
+++ b/lua54.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 21 18:24:02 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
+
+- Add final part of patch for CVE-2020-15888, boo#1174367
+- Add upstream patch 13
+
 -------------------------------------------------------------------
 Tue Aug 18 14:49:56 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
 
diff --git a/upstream-bugs.patch b/upstream-bugs.patch
index 6804f39..0848357 100644
--- a/upstream-bugs.patch
+++ b/upstream-bugs.patch
@@ -145,6 +145,17 @@
    luai_userstateresume(L, nargs);
 --- a/src/lundump.c
 +++ b/src/lundump.c
+@@ -120,7 +120,10 @@ static TString *loadStringN (LoadState *S, Proto *p) {
+   }
+   else {  /* long string */
+     ts = luaS_createlngstrobj(L, size);  /* create string */
++    setsvalue2s(L, L->top, ts);  /* anchor it ('loadVector' can GC) */
++    luaD_inctop(L);
+     loadVector(S, getstr(ts), size);  /* load directly in final place */
++    L->top--;  /* pop string */
+   }
+   luaC_objbarrier(L, p, ts);
+   return ts;
 @@ -205,8 +205,9 @@ static void loadUpvalues (LoadState *S, Proto *f) {
    n = loadInt(S);
    f->upvalues = luaM_newvectorchecked(S->L, n, Upvaldesc);
@@ -368,3 +379,14 @@
          }
          updatebase(ci);  /* function has new base after adjustment */
          vmbreak;
+--- a/src/ltm.c
++++ b/src/ltm.c
+@@ -240,7 +240,7 @@ void luaT_adjustvarargs (lua_State *L, int nfixparams, CallInfo *ci,
+   int actual = cast_int(L->top - ci->func) - 1;  /* number of arguments */
+   int nextra = actual - nfixparams;  /* number of extra arguments */
+   ci->u.l.nextraargs = nextra;
+-  checkstackGC(L, p->maxstacksize + 1);
++  luaD_checkstack(L, p->maxstacksize + 1);
+   /* copy function to the top of the stack */
+   setobjs2s(L, L->top++, ci->func);
+   /* move fixed parameters to the top of the stack */