libraries.mk: fix segfault on liblua NULL value

Signed-off-by: Markham <markham001@gmx.de>

diff --git a/archive-patches/lua-04-lua-lvm.c.patch b/archive-patches/lua-04-lua-lvm.c.patch
new file mode 100644 (file)
index 0000000..0d3961b
--- /dev/null
+++ b/archive-patches/lua-04-lua-lvm.c.patch
@@ -0,0 +1,13 @@
+--- a/src/lvm.c.org    2013-04-12 20:48:47.000000000 +0200
++++ b/src/lvm.c        2014-09-19 07:40:19.000000000 +0200
+@@ -539,6 +539,10 @@
+  newframe:  /* reentry point when frame changes (call/return) */
+   lua_assert(ci == L->ci);
+   cl = clLvalue(ci->func);
++  if (cl == NULL) {
++    printf("#####[liblua: src/lvm.c %s:%d] cl: %p, ci->func: %p\n", __FUNCTION__, __LINE__, cl, ci->func);
++    return;
++  }
+   k = cl->p->k;
+   base = ci->u.l.base;
+   /* main loop of interpreter */

diff --git a/make/libraries.mk b/make/libraries.mk
index 2c5e96e2cc5828cc65e1452c00c698ee86d3148b..990b34bcd4c0cde36a58df152a6e0294fc1cafb1 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -641,6 +641,7 @@ $(D)/lua: $(D)/libncurses $(ARCHIVE)/lua-5.2.3.tar.gz | $(TARGETPREFIX)
                $(PATCH)/lua-01-fix-coolstream-build.patch; \
                $(PATCH)/lua-02-shared-libs-for-lua.patch; \
                $(PATCH)/lua-03-lua-pc.patch; \
+               $(PATCH)/lua-04-lua-lvm.c.patch; \
                $(MAKE) linux PKG_VERSION=5.2.3 CC=$(TARGET)-gcc LD=$(TARGET)-ld AR="$(TARGET)-ar rcu" RANLIB=$(TARGET)-ranlib LDFLAGS="-L$(TARGETPREFIX)/lib"; \
                $(MAKE) install INSTALL_TOP=$(TARGETPREFIX)
        install -m 0755 -D $(BUILD_TMP)/lua-5.2.3/src/liblua.so.5.2.3 $(TARGETPREFIX)/lib/liblua.so.5.2.3