summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2008-02-12 05:19:05 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-02-12 05:19:05 +0000
commitbc3246f14624f96c82beaf94bba12fed77cef872 (patch)
tree2c0aedc83d3cd88b97f0902199af39b763bd4968
parentfc50684825ca09995884d4453c2fedd068ea882c (diff)
downloadgst-plugins-bad-bc3246f14624f96c82beaf94bba12fed77cef872.tar.gz
gst-plugins-bad-bc3246f14624f96c82beaf94bba12fed77cef872.tar.bz2
gst-plugins-bad-bc3246f14624f96c82beaf94bba12fed77cef872.zip
gst/librfb/gstrfbsrc.c: Free the rfb decoder on finalize. Fixes bug #515721.
Original commit message from CVS: * gst/librfb/gstrfbsrc.c: (gst_rfb_src_dispose): Free the rfb decoder on finalize. Fixes bug #515721.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/librfb/gstrfbsrc.c6
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c86732c..9a75243a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-12 Sebastian Dröge <slomo@circular-chaos.org>
+
+ * gst/librfb/gstrfbsrc.c: (gst_rfb_src_dispose):
+ Free the rfb decoder on finalize. Fixes bug #515721.
+
2008-02-11 Sebastian Dröge <slomo@circular-chaos.org>
* sys/fbdev/gstfbdevsink.c: (gst_fbdevsink_class_init),
diff --git a/common b/common
-Subproject 961bb6bd997d7c8da6058534e86b4a1361c0fce
+Subproject 05a617c9043ddb78f8578195b18c166d7e1d4c2
diff --git a/gst/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 0df0555f..b218fceb 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -180,7 +180,11 @@ gst_rfb_src_dispose (GObject * object)
GstRfbSrc *src = GST_RFB_SRC (object);
g_free (src->host);
- rfb_decoder_free (src->decoder);
+ if (src->decoder) {
+ rfb_decoder_free (src->decoder);
+ g_free (src->decoder);
+ src->decoder = NULL;
+ }
G_OBJECT_CLASS (parent_class)->dispose (object);
}