Linux bluetooth development
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFC] adapter: Fix memory leak
Date: Fri, 15 May 2015 17:27:44 +0300	[thread overview]
Message-ID: <1431700064-21419-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

In case of error with dbus stuff free allocated memory and set filter
to NULL.
---
 src/adapter.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/adapter.c b/src/adapter.c
index 8ee5b5b..7035a69 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2219,8 +2219,11 @@ static bool parse_discovery_filter_dict(struct discovery_filter **filter,
 
 	dbus_message_iter_init(msg, &iter);
 	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
-	    dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY)
+	    dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY) {
+		g_free(*filter);
+		*filter = NULL;
 		return false;
+	}
 
 	dbus_message_iter_recurse(&iter, &subiter);
 	do {
-- 
2.1.4


             reply	other threads:[~2015-05-15 14:27 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-15 14:27 Andrei Emeltchenko [this message]
2015-05-17  7:31 ` [RFC] adapter: Fix memory leak Johan Hedberg
2015-05-18  7:13   ` [PATHv2] " Andrei Emeltchenko
2015-05-18  7:45     ` Johan Hedberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1431700064-21419-1-git-send-email-Andrei.Emeltchenko.news@gmail.com \
    --to=andrei.emeltchenko.news@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox