[arch-commits] Commit in fwupd/trunk (PKGBUILD fix-refresh-crash.patch)

[Bruno Pagani]

    Date: Wednesday, June 14, 2017 @ 11:53:57
  Author: archange
Revision: 236754

upgpkg: fwupd 0.9.3-3

Fix crash when running fwupdmgr refresh

Added:
  fwupd/trunk/fix-refresh-crash.patch
Modified:
  fwupd/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    9 ++++++---
 fix-refresh-crash.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-14 10:28:55 UTC (rev 236753)
+++ PKGBUILD	2017-06-14 11:53:57 UTC (rev 236754)
@@ -3,7 +3,7 @@
 
 pkgname=fwupd
 pkgver=0.9.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple daemon to allow session software to update firmware'
 arch=('i686' 'x86_64')
 url='https://github.com/hughsie/fwupd'
@@ -14,15 +14,18 @@
              'gobject-introspection' 'gtk-doc')
 source=(${pkgname}-${pkgver}.tar.gz::"${url}/archive/${pkgver}.tar.gz"
         'fix-missing-test-files.patch'
-        'fix-failure-without-remote-d.patch')
+        'fix-failure-without-remote-d.patch'
+        'fix-refresh-crash.patch')
 sha256sums=('56840998a4a7757ac93732c4a51e203e1fef1497dc98ebc175310b132da2a2cc'
             'ee2bb86e1efaff2d4ca3f2ed55fd8b685cba2cb40debf1418d4e91e27dba00a7'
-            '79a5ffc151067d52ff49af55b851b8bcd0976e47d1751268fb1bdd61b46f5dbe')
+            '79a5ffc151067d52ff49af55b851b8bcd0976e47d1751268fb1bdd61b46f5dbe'
+            '0718def1d7572e47822e76d4745971f64c8ec070de6d8778ea9816a218011bb8')
 
 prepare() {
     cd ${pkgname}-${pkgver}
     patch -p1 -i ../fix-missing-test-files.patch
     patch -p1 -i ../fix-failure-without-remote-d.patch
+    patch -p1 -i ../fix-refresh-crash.patch
 }
 
 build() {

Added: fix-refresh-crash.patch
===================================================================
--- fix-refresh-crash.patch	                        (rev 0)
+++ fix-refresh-crash.patch	2017-06-14 11:53:57 UTC (rev 236754)
@@ -0,0 +1,29 @@
+From b38a4fdfd631a800d4171a4eb3e519075755f430 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Tue, 13 Jun 2017 15:23:58 +0100
+Subject: [PATCH] Fix a crash when refreshing metadata
+
+When processing the file handles it seems g_variant_get() actually wants to
+write the fd integer. This bug does not happen every time, and seems to vanish
+every time under valgrind.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1460429
+---
+ src/fu-main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/fu-main.c b/src/fu-main.c
+index f1fdd68..f9b1973 100644
+--- a/src/fu-main.c
++++ b/src/fu-main.c
+@@ -2087,8 +2087,8 @@ fu_main_daemon_method_call (GDBusConnection *connection, const gchar *sender,
+ 		gint fd_data;
+ 		gint fd_sig;
+ 
+-		g_variant_get (parameters, "(&shh)", &id);
+-		g_debug ("Called %s(%s)", method_name, id);
++		g_variant_get (parameters, "(&shh)", &id, &fd_data, &fd_sig);
++		g_debug ("Called %s(%s,%i,%i)", method_name, id, fd_data, fd_sig);
+ 
+ 		message = g_dbus_method_invocation_get_message (invocation);
+ 		fd_list = g_dbus_message_get_unix_fd_list (message);