From patchwork Tue Jan 14 13:14:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Perrad X-Patchwork-Id: 310727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C6D6F2C009E for ; Wed, 15 Jan 2014 00:15:19 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97BA98B8CD; Tue, 14 Jan 2014 13:15:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fxZYni8TUxMp; Tue, 14 Jan 2014 13:15:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3F04F8B8BD; Tue, 14 Jan 2014 13:15:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5E0181BF994 for ; Tue, 14 Jan 2014 13:15:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5590A8C00E for ; Tue, 14 Jan 2014 13:15:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q3TAYW9HDncH for ; Tue, 14 Jan 2014 13:15:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id 988078B4A2 for ; Tue, 14 Jan 2014 13:15:11 +0000 (UTC) Received: by mail-wi0-f175.google.com with SMTP id hr1so678286wib.14 for ; Tue, 14 Jan 2014 05:15:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oNZkz/5w27TdaYP/LEwyUyLmRPxUXerA6nj8f2Ilm3E=; b=I9GTEyyDry4Jslh6Q8/GikUJEWgz/tl35aOl1TGqitS/0VsU3imWT1Aq/Hk+jvDv6E HAuO3EGNyRUaNKV6eZiKUhhK1+CRvYHgRFZS8duToFxe4hLQxw2mHXZwrkIcVPD8KmUg 3ZBfeUBeEPYIeINAmnD2/BxFWnLo9APupk9SJer3khrDrPbH9X7iTqftuNyvP19U3VU5 QAAJxX1/hvW36kCeIQsjBypEzXcdwLzIsm3ozXNGfHsRAwQxKmgRAJx/g5cPVGcrTLa6 cGOIMNCumqD7vFd/R9zTw6vwZRaLD2cu3+aBhrejp7fuLJLJfReozm7qvC7OR1uYl/Au zB7w== X-Received: by 10.194.93.67 with SMTP id cs3mr233006wjb.26.1389705310196; Tue, 14 Jan 2014 05:15:10 -0800 (PST) Received: from ubuntu.localdomain (94.166.87.79.rev.sfr.net. [79.87.166.94]) by mx.google.com with ESMTPSA id gz5sm1406803wib.10.2014.01.14.05.15.08 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 05:15:09 -0800 (PST) From: Francois Perrad To: buildroot@busybox.net Date: Tue, 14 Jan 2014 14:14:57 +0100 Message-Id: <1389705298-27263-3-git-send-email-francois.perrad@gadz.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389705298-27263-1-git-send-email-francois.perrad@gadz.org> References: <1389705298-27263-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH 2/3] lua: add official patches X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net from http://www.lua.org/bugs.html Signed-off-by: Francois Perrad --- package/lua/5.1.5/lua-bug2.patch | 46 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/lua/5.1.5/lua-bug2.patch diff --git a/package/lua/5.1.5/lua-bug2.patch b/package/lua/5.1.5/lua-bug2.patch new file mode 100644 index 0000000..729c22d --- /dev/null +++ b/package/lua/5.1.5/lua-bug2.patch @@ -0,0 +1,46 @@ +When loading a file, Lua may call the reader function again after it returned end of input. + +Backported from http://www.lua.org/bugs.html#5.1.5-2 + +Signed-off-by: Francois Perrad + +Index: b/src/lzio.c +=================================================================== +--- a/src/lzio.c ++++ b/src/lzio.c +@@ -22,10 +22,14 @@ + size_t size; + lua_State *L = z->L; + const char *buff; ++ if (z->eoz) return EOZ; + lua_unlock(L); + buff = z->reader(L, z->data, &size); + lua_lock(L); +- if (buff == NULL || size == 0) return EOZ; ++ if (buff == NULL || size == 0) { ++ z->eoz = 1; /* avoid calling reader function next time */ ++ return EOZ; ++ } + z->n = size - 1; + z->p = buff; + return char2int(*(z->p++)); +@@ -51,6 +55,7 @@ + z->data = data; + z->n = 0; + z->p = NULL; ++ z->eoz = 0; + } + + +Index: b/src/lzio.h +=================================================================== +--- a/src/lzio.h ++++ b/src/lzio.h +@@ -59,6 +59,7 @@ + lua_Reader reader; + void* data; /* additional data */ + lua_State *L; /* Lua state (for reader) */ ++ int eoz; /* true if reader has no more data */ + }; + +