diff options
| author |   Maxin B. John <maxin.john@intel.com> | 2016-01-07 16:31:35 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-11 23:23:16 +0000 |
| commit | 0a556af62b509f9defd8ac5b3a6648bdfe1dff67 (patch) | |
| tree | 0fc3f404c24fa11e5ddc19069ba736973ad0093b /meta/recipes-connectivity/bluez5/bluez5 | |
| parent | 48b0bc85502e394f13898bbec61e21f9282b0edf (diff) | |
| download | openembedded-core-contrib-0a556af62b509f9defd8ac5b3a6648bdfe1dff67.tar.gz | |
bluez5: upgrade to 5.37
5.36 -> 5.37
Remove the backported patch:
core-profile-Fix-possible-crash-when-registering-pro.patch
Build bluez5 only when DISTRO_FEATURES include bluez5
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5')
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch b/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch deleted file mode 100644 index 5c6cee1cff..0000000000 --- a/meta/recipes-connectivity/bluez5/bluez5/core-profile-Fix-possible-crash-when-registering-pro.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc4dbda3362d3654447d8ae6525cac1540b7d705 Mon Sep 17 00:00:00 2001 -From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Date: Thu, 5 Nov 2015 15:14:50 +0200 -Subject: [PATCH] core/profile: Fix possible crash when registering profiles - -Upstream-Status: Backport - -Profiles under ext_profiles are local and should no be mixed with other -external profiles since its type is different which can may cause invalid -memory when accessing member of ext_profile struct. ---- - src/profile.c | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/profile.c b/src/profile.c -index 49445d7..5a4f09c 100644 ---- a/src/profile.c -+++ b/src/profile.c -@@ -719,19 +719,13 @@ void btd_profile_foreach(void (*func)(struct btd_profile *p, void *data), - - int btd_profile_register(struct btd_profile *profile) - { -- if (profile->external) -- ext_profiles = g_slist_append(ext_profiles, profile); -- else -- profiles = g_slist_append(profiles, profile); -+ profiles = g_slist_append(profiles, profile); - return 0; - } - - void btd_profile_unregister(struct btd_profile *profile) - { -- if (profile->external) -- ext_profiles = g_slist_remove(ext_profiles, profile); -- else -- profiles = g_slist_remove(profiles, profile); -+ profiles = g_slist_remove(profiles, profile); - } - - static struct ext_profile *find_ext_profile(const char *owner, -@@ -742,10 +736,6 @@ static struct ext_profile *find_ext_profile(const char *owner, - for (l = ext_profiles; l != NULL; l = g_slist_next(l)) { - struct ext_profile *ext = l->data; - -- /* -- * Owner and path can be NULL if profile was registered by a -- * plugin using external flag. -- */ - if (g_strcmp0(ext->owner, owner)) - continue; - --- -2.5.0 - |