[arch-commits] Commit in lib32-dbus/trunk (PKGBUILD memleak.patch)

[Laurent Carlier]

    Date: Saturday, November 30, 2013 @ 07:28:17
  Author: lcarlier
Revision: 101678

upgpkg: lib32-dbus 1.6.18-1

Sync with core

Added:
  lib32-dbus/trunk/memleak.patch
Modified:
  lib32-dbus/trunk/PKGBUILD

---------------+
 PKGBUILD      |   15 +++++++++++----
 memleak.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-30 06:20:24 UTC (rev 101677)
+++ PKGBUILD	2013-11-30 06:28:17 UTC (rev 101678)
@@ -3,7 +3,7 @@
 
 pkgname=lib32-dbus
 _pkgbasename=dbus
-pkgver=1.6.16
+pkgver=1.6.18
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 arch=('x86_64')
@@ -14,10 +14,17 @@
 provides=('lib32-dbus-core')
 conflicts=('lib32-dbus-core')
 replaces=('lib32-dbus-core')
-options=(!libtool)
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz)
-md5sums=('1de63d9983d7785836ffae6c2181c698')
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
+	memleak.patch)
+md5sums=('b02e9c95027a416987b81f9893831061'
+	 'cf86d68e39d975cec1e9f0342eb9b142')
 
+prepare() {
+    cd "${srcdir}/dbus-${pkgver}"
+
+    patch -Np1 -i ../memleak.patch
+}
+
 build() {
     export CC="gcc -m32"
     export CXX="g++ -m32"

Added: memleak.patch
===================================================================
--- memleak.patch	                        (rev 0)
+++ memleak.patch	2013-11-30 06:28:17 UTC (rev 101678)
@@ -0,0 +1,37 @@
+From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
+From: Radoslaw Pajak <r.pajak at samsung.com>
+Date: Fri, 08 Nov 2013 12:51:32 +0000
+Subject: fixed memory freeing if error during listing services
+
+Signed-off-by: Radoslaw Pajak <r.pajak at samsung.com>
+Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
+---
+diff --git a/bus/activation.c b/bus/activation.c
+index fcb7133..ea48a26 100644
+--- a/bus/activation.c
++++ b/bus/activation.c
+@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
+ 
+  error:
+   for (j = 0; j < i; j++)
+-    dbus_free (retval[i]);
++    dbus_free (retval[j]);
+   dbus_free (retval);
+ 
+   return FALSE;
+diff --git a/bus/services.c b/bus/services.c
+index 6f380fa..01a720e 100644
+--- a/bus/services.c
++++ b/bus/services.c
+@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
+   
+  error:
+   for (j = 0; j < i; j++)
+-    dbus_free (retval[i]);
++    dbus_free (retval[j]);
+   dbus_free (retval);
+ 
+   return FALSE;
+--
+cgit v0.9.0.2-2-gbebe