From 7d887fd2fbc392083db2fa76749c4a92af1bb364 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 7 Jun 2010 13:18:59 +0200 Subject: [PATCH] lua: Updated (5.1.4 -> 5.1.4-1) incorporating available upstream bugfixes --- lua/lua/lua-5.1.4-upstream-bugfix.patch | 216 ++++++++++++++++++++++++ lua/lua/lua.desc | 5 +- 2 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 lua/lua/lua-5.1.4-upstream-bugfix.patch diff --git a/lua/lua/lua-5.1.4-upstream-bugfix.patch b/lua/lua/lua-5.1.4-upstream-bugfix.patch new file mode 100644 index 000000000..13a207fa8 --- /dev/null +++ b/lua/lua/lua-5.1.4-upstream-bugfix.patch @@ -0,0 +1,216 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../lua/lua-5.1.4-upstream-bugfix.patch +# Copyright (C) 2010 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +diff --git lua-5.1.4/src/lcode.c lua-5.1.4-bugfix/src/lcode.c +index cff626b..e9aa88d 100644 +--- lua-5.1.4/src/lcode.c ++++ lua-5.1.4-bugfix/src/lcode.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lcode.c,v 2.25.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lcode.c,v 2.25.1.4 2009/06/15 14:12:25 roberto Exp $ + ** Code generator for Lua + ** See Copyright Notice in lua.h + */ +@@ -544,15 +544,18 @@ void luaK_goiftrue (FuncState *fs, expdesc *e) { + pc = NO_JUMP; /* always true; do nothing */ + break; + } +- case VFALSE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + invertjump(fs, e); + pc = e->u.s.info; + break; + } ++ case VFALSE: { ++ if (!hasjumps(e)) { ++ pc = luaK_jump(fs); /* always jump */ ++ break; ++ } ++ /* else go through */ ++ } + default: { + pc = jumponcond(fs, e, 0); + break; +@@ -572,14 +575,17 @@ static void luaK_goiffalse (FuncState *fs, expdesc *e) { + pc = NO_JUMP; /* always false; do nothing */ + break; + } +- case VTRUE: { +- pc = luaK_jump(fs); /* always jump */ +- break; +- } + case VJMP: { + pc = e->u.s.info; + break; + } ++ case VTRUE: { ++ if (!hasjumps(e)) { ++ pc = luaK_jump(fs); /* always jump */ ++ break; ++ } ++ /* else go through */ ++ } + default: { + pc = jumponcond(fs, e, 1); + break; +diff --git lua-5.1.4/src/ldblib.c lua-5.1.4-bugfix/src/ldblib.c +index 67de122..2027eda 100644 +--- lua-5.1.4/src/ldblib.c ++++ lua-5.1.4-bugfix/src/ldblib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: ldblib.c,v 1.104.1.3 2008/01/21 13:11:21 roberto Exp $ ++** $Id: ldblib.c,v 1.104.1.4 2009/08/04 18:50:18 roberto Exp $ + ** Interface from Lua to its debug API + ** See Copyright Notice in lua.h + */ +@@ -45,6 +45,7 @@ static int db_setmetatable (lua_State *L) { + + + static int db_getfenv (lua_State *L) { ++ luaL_checkany(L, 1); + lua_getfenv(L, 1); + return 1; + } +diff --git lua-5.1.4/src/liolib.c lua-5.1.4-bugfix/src/liolib.c +index e79ed1c..649f9a5 100644 +--- lua-5.1.4/src/liolib.c ++++ lua-5.1.4-bugfix/src/liolib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: liolib.c,v 2.73.1.3 2008/01/18 17:47:43 roberto Exp $ ++** $Id: liolib.c,v 2.73.1.4 2010/05/14 15:33:51 roberto Exp $ + ** Standard I/O (and system) library + ** See Copyright Notice in lua.h + */ +@@ -276,7 +276,10 @@ static int read_number (lua_State *L, FILE *f) { + lua_pushnumber(L, d); + return 1; + } +- else return 0; /* read fails */ ++ else { ++ lua_pushnil(L); /* "result" to be removed */ ++ return 0; /* read fails */ ++ } + } + + +diff --git lua-5.1.4/src/llex.c lua-5.1.4-bugfix/src/llex.c +index 6dc3193..88c6790 100644 +--- lua-5.1.4/src/llex.c ++++ lua-5.1.4-bugfix/src/llex.c +@@ -1,5 +1,5 @@ + /* +-** $Id: llex.c,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ ++** $Id: llex.c,v 2.20.1.2 2009/11/23 14:58:22 roberto Exp $ + ** Lexical Analyzer + ** See Copyright Notice in lua.h + */ +@@ -118,8 +118,10 @@ TString *luaX_newstring (LexState *ls, const char *str, size_t l) { + lua_State *L = ls->L; + TString *ts = luaS_newlstr(L, str, l); + TValue *o = luaH_setstr(L, ls->fs->h, ts); /* entry for `str' */ +- if (ttisnil(o)) ++ if (ttisnil(o)) { + setbvalue(o, 1); /* make sure `str' will not be collected */ ++ luaC_checkGC(L); ++ } + return ts; + } + +diff --git lua-5.1.4/src/loadlib.c lua-5.1.4-bugfix/src/loadlib.c +index 0d401eb..6158c53 100644 +--- lua-5.1.4/src/loadlib.c ++++ lua-5.1.4-bugfix/src/loadlib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ++** $Id: loadlib.c,v 1.52.1.4 2009/09/09 13:17:16 roberto Exp $ + ** Dynamic library loader for Lua + ** See Copyright Notice in lua.h + ** +@@ -639,7 +639,7 @@ LUALIB_API int luaopen_package (lua_State *L) { + lua_pushvalue(L, -1); + lua_replace(L, LUA_ENVIRONINDEX); + /* create `loaders' table */ +- lua_createtable(L, 0, sizeof(loaders)/sizeof(loaders[0]) - 1); ++ lua_createtable(L, sizeof(loaders)/sizeof(loaders[0]) - 1, 0); + /* fill it with pre-defined loaders */ + for (i=0; loaders[i] != NULL; i++) { + lua_pushcfunction(L, loaders[i]); +diff --git lua-5.1.4/src/lstrlib.c lua-5.1.4-bugfix/src/lstrlib.c +index 1b4763d..7a03489 100644 +--- lua-5.1.4/src/lstrlib.c ++++ lua-5.1.4-bugfix/src/lstrlib.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ++** $Id: lstrlib.c,v 1.132.1.5 2010/05/14 15:34:19 roberto Exp $ + ** Standard library for string operations and pattern-matching + ** See Copyright Notice in lua.h + */ +@@ -754,6 +754,7 @@ static void addintlen (char *form) { + + + static int str_format (lua_State *L) { ++ int top = lua_gettop(L); + int arg = 1; + size_t sfl; + const char *strfrmt = luaL_checklstring(L, arg, &sfl); +@@ -768,7 +769,8 @@ static int str_format (lua_State *L) { + else { /* format item */ + char form[MAX_FORMAT]; /* to store the format (`%...') */ + char buff[MAX_ITEM]; /* to store the formatted item */ +- arg++; ++ if (++arg > top) ++ luaL_argerror(L, arg, "no value"); + strfrmt = scanformat(L, strfrmt, form); + switch (*strfrmt++) { + case 'c': { +diff --git lua-5.1.4/src/lvm.c lua-5.1.4-bugfix/src/lvm.c +index ee3256a..8aeafda 100644 +--- lua-5.1.4/src/lvm.c ++++ lua-5.1.4-bugfix/src/lvm.c +@@ -1,5 +1,5 @@ + /* +-** $Id: lvm.c,v 2.63.1.3 2007/12/28 15:32:23 roberto Exp $ ++** $Id: lvm.c,v 2.63.1.4 2009/07/01 21:10:33 roberto Exp $ + ** Lua virtual machine + ** See Copyright Notice in lua.h + */ +@@ -133,6 +133,7 @@ void luaV_gettable (lua_State *L, const TValue *t, TValue *key, StkId val) { + + void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + int loop; ++ TValue temp; + for (loop = 0; loop < MAXTAGLOOP; loop++) { + const TValue *tm; + if (ttistable(t)) { /* `t' is a table? */ +@@ -152,7 +153,9 @@ void luaV_settable (lua_State *L, const TValue *t, TValue *key, StkId val) { + callTM(L, tm, t, key, val); + return; + } +- t = tm; /* else repeat with `tm' */ ++ /* else repeat with `tm' */ ++ setobj(L, &temp, tm); /* avoid pointing inside table (may rehash) */ ++ t = &temp; + } + luaG_runerror(L, "loop in settable"); + } diff --git a/lua/lua/lua.desc b/lua/lua/lua.desc index 973a9dc38..958133486 100644 --- a/lua/lua/lua.desc +++ b/lua/lua/lua.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../lua/lua.desc -[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -36,8 +36,7 @@ [L] MIT [S] Stable -[V] 5.1.4 +[V] 5.1.4-1 [P] X -?---5---9 109.800 [D] 2070109183 lua-5.1.4.tar.gz http://www.lua.org/ftp/ -