diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-04-02 02:50:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 11:48:29 +0100 |
| commit | a09a4e60a454b60c6d6e1e28fb4dda88fce9ae7d (patch) | |
| tree | 69f3b7b00daaac718ba21008a1871f1e64f9a4fe /meta/recipes-core/dbus | |
| parent | 8f191a37625ba6fe2e109555fa99658c4fcd7a37 (diff) | |
| download | openembedded-core-a09a4e60a454b60c6d6e1e28fb4dda88fce9ae7d.tar.gz openembedded-core-a09a4e60a454b60c6d6e1e28fb4dda88fce9ae7d.tar.bz2 openembedded-core-a09a4e60a454b60c6d6e1e28fb4dda88fce9ae7d.zip | |
dbus: backport memory leak patch for error when listing services
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>
Diffstat (limited to 'meta/recipes-core/dbus')
| -rw-r--r-- | meta/recipes-core/dbus/dbus.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch | 45 |
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index 5d57ff4bb4..5727ae77b2 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -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 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 new file mode 100644 index 0000000000..96290f41be --- /dev/null +++ b/meta/recipes-core/dbus/dbus/fixed-memory-freeing-if-error-during-listing-service.patch @@ -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 + |