[arch-commits] Commit in hexchat/trunk (2 files)

[Christian Hesse]

    Date: Sunday, April 4, 2021 @ 20:22:10
  Author: eworm
Revision: 911797

upgpkg: hexchat 2.14.3-7: fix segfault on lua_pop with Lua 5.4.3

Added:
  hexchat/trunk/0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch
Modified:
  hexchat/trunk/PKGBUILD

---------------------------------------------------+
 0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch |   30 ++++++++++++++++++++
 PKGBUILD                                          |    9 ++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

Added: 0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch
===================================================================
--- 0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch	                        (rev 0)
+++ 0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch	2021-04-04 20:22:10 UTC (rev 911797)
@@ -0,0 +1,30 @@
+From d6319bd8f21042db62f6c7094066052d894416ef Mon Sep 17 00:00:00 2001
+From: Mateusz Gozdek <mgozdekof at gmail.com>
+Date: Sun, 4 Apr 2021 21:07:30 +0200
+Subject: [PATCH] plugins/lua/lua.c: fix segfault on lua_pop with Lua 5.4.3
+
+Closes #2558
+
+Co-authored-by: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Signed-off-by: Mateusz Gozdek <mgozdekof at gmail.com>
+---
+ plugins/lua/lua.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
+index d73fbb230..d1370eafb 100644
+--- a/plugins/lua/lua.c
++++ b/plugins/lua/lua.c
+@@ -1189,11 +1189,11 @@ static void patch_clibs(lua_State *L)
+ 		if(lua_type(L, -2) == LUA_TLIGHTUSERDATA && lua_type(L, -1) == LUA_TTABLE)
+ 		{
+ 			lua_setfield(L, LUA_REGISTRYINDEX, "_CLIBS");
++			lua_pop(L, 1);
+ 			break;
+ 		}
+ 		lua_pop(L, 1);
+ 	}
+-	lua_pop(L, 1);
+ }
+ 
+ static GPtrArray *scripts;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-04 20:20:10 UTC (rev 911796)
+++ PKGBUILD	2021-04-04 20:22:10 UTC (rev 911797)
@@ -3,7 +3,7 @@
 
 pkgname=hexchat
 pkgver=2.14.3
-pkgrel=6
+pkgrel=7
 pkgdesc='A popular and easy to use graphical IRC (chat) client'
 arch=('x86_64')
 url='https://hexchat.github.io/'
@@ -19,11 +19,13 @@
 source=("git+https://github.com/hexchat/hexchat.git#tag=v${pkgver}"
         '0001-python-cffi.patch'
         '0002-python-3-8.patch'
-        '0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch')
+        '0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch'
+        '0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch')
 sha256sums=('SKIP'
             '92af0d106627c9b9716036ce81f697de35f37b4ba2e7bd34244824520e485bba'
             '8d17ce657e744272815b5fb33d8ad959f79ece3294349637eaadcf86d90496fa'
-            '691f344479a8b1186008516f0ebe7e3d482059cd297f58573634fa5a58f3d0ca')
+            '691f344479a8b1186008516f0ebe7e3d482059cd297f58573634fa5a58f3d0ca'
+            'a8d6917deec758b3a822471316f0bd7819d3661ef6f657c52953711227a2cbe6')
 
 prepare() {
   cd hexchat
@@ -30,6 +32,7 @@
   patch -Np1 < ../0001-python-cffi.patch
   patch -Np1 < ../0002-python-3-8.patch
   patch -Np1 < ../0003-Use-pango_font_metrics_get_height-to-calculate-font-height.patch
+  patch -Np1 < ../0004-fix_segfault_on_lua_pop_with_Lua_5.4.3.patch
 }
 
 build() {