From 19e01a142e9ab983055b2f4cdb5490a99fbd3149 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 25 Jul 2016 16:08:19 -0400 Subject: apply upstream fixes for bug 1 & 2 --- lua-5.3.3-upstream-bug-2.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 lua-5.3.3-upstream-bug-2.patch (limited to 'lua-5.3.3-upstream-bug-2.patch') diff --git a/lua-5.3.3-upstream-bug-2.patch b/lua-5.3.3-upstream-bug-2.patch new file mode 100644 index 0000000..96cf85a --- /dev/null +++ b/lua-5.3.3-upstream-bug-2.patch @@ -0,0 +1,13 @@ +diff -up lua-5.3.3/src/loslib.c.readpast lua-5.3.3/src/loslib.c +--- lua-5.3.3/src/loslib.c.readpast 2016-07-25 16:04:13.916465061 -0400 ++++ lua-5.3.3/src/loslib.c 2016-07-25 16:04:19.756423878 -0400 +@@ -260,7 +260,8 @@ static int getfield (lua_State *L, const + static const char *checkoption (lua_State *L, const char *conv, char *buff) { + const char *option; + int oplen = 1; +- for (option = LUA_STRFTIMEOPTIONS; *option != '\0'; option += oplen) { ++ int convlen = (int)strlen(conv); ++ for (option = LUA_STRFTIMEOPTIONS; *option != '\0' && oplen <= convlen; option += oplen) { + if (*option == '|') /* next block? */ + oplen++; /* next length */ + else if (memcmp(conv, option, oplen) == 0) { /* match? */ -- cgit