summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-05-14 17:29:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-15 23:24:42 +0100
commit48fc1aac623347eaed87ec640aab0376839569c7 (patch)
treec9a5194cbb8573c7c0cf76603196ccde67490136 /meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
parent53082b1ae6df280afa9b7548fef93c9409cd7352 (diff)
downloadpoky-48fc1aac623347eaed87ec640aab0376839569c7.tar.gz
dbus: Update to 1.8.2 version
Upgrade dbus to 1.8.2. Modify ptest suite to make it enabled on new version. If systemd in DISTRO_FEATURES, we expect to install dbus systemd unit files. Remove unneeded patches since it's included in new version. Remove unrecognized option: "--with-xml" [YOCTO #6092] (From OE-Core rev: 596470547451084944082cbed50351ad0d912255) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch')
-rw-r--r--meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch b/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
deleted file mode 100644
index 96290f41be..0000000000
--- a/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
2From: Radoslaw Pajak <r.pajak@samsung.com>
3Date: Fri, 8 Nov 2013 13:51:32 +0100
4Subject: [PATCH] fixed memory freeing if error during listing services
5
6Upstream-Status: Backport
7
8Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
9Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
10Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
11Signed-off-by: Jonathan Liu <net147@gmail.com>
12---
13 bus/activation.c | 2 +-
14 bus/services.c | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/bus/activation.c b/bus/activation.c
18index fcb7133..ea48a26 100644
19--- a/bus/activation.c
20+++ b/bus/activation.c
21@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
22
23 error:
24 for (j = 0; j < i; j++)
25- dbus_free (retval[i]);
26+ dbus_free (retval[j]);
27 dbus_free (retval);
28
29 return FALSE;
30diff --git a/bus/services.c b/bus/services.c
31index 6f380fa..01a720e 100644
32--- a/bus/services.c
33+++ b/bus/services.c
34@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
35
36 error:
37 for (j = 0; j < i; j++)
38- dbus_free (retval[i]);
39+ dbus_free (retval[j]);
40 dbus_free (retval);
41
42 return FALSE;
43--
441.9.0
45