summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2008-02-12 21:31:57 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2008-02-12 21:31:57 +0000
commit6c1278d35c97a5be11f35dcb812a1c7f303f1ebe (patch)
treea5550a96dce7d51d7c358f6949a373c2e4e2c150
parent1a74d7922af0c0ed00ad65cbc9bb1d5e7b76ff16 (diff)
downloadgstreamer-plugins-bad-6c1278d35c97a5be11f35dcb812a1c7f303f1ebe.tar.gz
sys/dvb/dvbbasebin.c: Fix leak of location string returned from gst_uri_get_location.
Original commit message from CVS: * sys/dvb/dvbbasebin.c: Fix leak of location string returned from gst_uri_get_location. Fixes bug #516114
-rw-r--r--ChangeLog6
-rw-r--r--sys/dvb/dvbbasebin.c9
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ebaddb16..0faef610e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-12 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * sys/dvb/dvbbasebin.c:
+ Fix leak of location string returned from gst_uri_get_location.
+ Fixes bug #516114
+
2008-02-12 David Schleef <ds@schleef.org>
* configure.ac:
diff --git a/sys/dvb/dvbbasebin.c b/sys/dvb/dvbbasebin.c
index bc13eddb0..e10adab31 100644
--- a/sys/dvb/dvbbasebin.c
+++ b/sys/dvb/dvbbasebin.c
@@ -992,8 +992,13 @@ dvb_base_bin_uri_set_uri (GstURIHandler * handler, const gchar * uri)
if (strcmp (protocol, "dvb") != 0) {
ret = FALSE;
} else {
- ret = set_properties_for_channel (G_OBJECT (dvbbasebin),
- gst_uri_get_location (uri));
+ gchar *location = gst_uri_get_location (uri);
+
+ if (location != NULL) {
+ ret = set_properties_for_channel (G_OBJECT (dvbbasebin), location);
+ g_free (location);
+ } else
+ ret = FALSE;
}
/* here is where we parse channels.conf */