summaryrefslogtreecommitdiff
path: root/sys/bluez
diff options
context:
space:
mode:
authorSyam Sidhardhan <s.syam@samsung.com>2012-09-14 21:40:10 +0530
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2013-01-09 14:30:14 +0000
commit711e5b490906e0fcf26554395d4145d255cc37bb (patch)
tree9b244bf0427133f57dbc229bc5cfbbdd06853689 /sys/bluez
parentf1c526da47c96583217d3d1303b82cfdea670b36 (diff)
downloadgstreamer-plugins-bad-711e5b490906e0fcf26554395d4145d255cc37bb.tar.gz
bluez: gstavdtpsink: Free the D-Bus error on reply failure
If D-Bus error is set we should free it.
Diffstat (limited to 'sys/bluez')
-rw-r--r--sys/bluez/gstavdtpsink.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/bluez/gstavdtpsink.c b/sys/bluez/gstavdtpsink.c
index a2986feae..50951af29 100644
--- a/sys/bluez/gstavdtpsink.c
+++ b/sys/bluez/gstavdtpsink.c
@@ -790,13 +790,19 @@ gst_avdtp_sink_transport_get_properties (GstAvdtpSink * self)
msg = dbus_message_new_method_call ("org.bluez", self->transport,
"org.bluez.MediaTransport", "GetProperties");
+ if (!msg) {
+ GST_ERROR_OBJECT (self, "D-Bus Memory allocation failed");
+ return FALSE;
+ }
+
reply = dbus_connection_send_with_reply_and_block (self->data->conn,
msg, -1, &err);
+ dbus_message_unref (msg);
- if (dbus_error_is_set (&err) || reply == NULL) {
- GST_ERROR_OBJECT (self, "Failed to get transport properties: %s",
- err.message);
- goto fail;
+ if (dbus_error_is_set (&err)) {
+ GST_ERROR_OBJECT (self, "GetProperties failed: %s", err.message);
+ dbus_error_free (&err);
+ return FALSE;
}
if (!dbus_message_iter_init (reply, &arg_i)) {
@@ -827,7 +833,6 @@ gst_avdtp_sink_transport_get_properties (GstAvdtpSink * self)
return gst_avdtp_sink_update_caps (self);
fail:
- dbus_message_unref (msg);
dbus_message_unref (reply);
return FALSE;