dbus: backport memory leak patch for error when listing services

(From OE-Core rev: a09a4e60a454b60c6d6e1e28fb4dda88fce9ae7d)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jonathan Liu
2014-04-02 02:50:09 +00:00
committed by Richard Purdie
parent ed7afe2f6b
commit d67e087dcd
2 changed files with 46 additions and 0 deletions

View File

@@ -16,6 +16,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://os-test.patch \
file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
file://Set-correct-address-when-using-address-systemd.patch \
file://fixed-memory-freeing-if-error-during-listing-service.patch \
"
inherit useradd autotools pkgconfig gettext update-rc.d

View File

@@ -0,0 +1,45 @@
From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
From: Radoslaw Pajak <r.pajak@samsung.com>
Date: Fri, 8 Nov 2013 13:51:32 +0100
Subject: [PATCH] fixed memory freeing if error during listing services
Upstream-Status: Backport
Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
Signed-off-by: Jonathan Liu <net147@gmail.com>
---
bus/activation.c | 2 +-
bus/services.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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;
--
1.9.0