4 files changed, 10 insertions, 3 deletions
diff --git a/gst-libs/gst/mixer/mixertrack.c b/gst-libs/gst/mixer/mixertrack.c
index ea531d5f..36ce288d 100644
--- a/gst-libs/gst/mixer/mixertrack.c
+++ b/gst-libs/gst/mixer/mixertrack.c
@@ -183,8 +183,10 @@ gst_mixer_track_dispose (GObject * object)
 {
   GstMixerTrack *channel = GST_MIXER_TRACK (object);
 
-  if (channel->label)
+  if (channel->label) {
     g_free (channel->label);
+    channel->label = NULL;
+  }
 
   if (parent_class->dispose)
     parent_class->dispose (object);
diff --git a/gst-libs/gst/tuner/tunerchannel.c b/gst-libs/gst/tuner/tunerchannel.c
index de0be2e4..1826a3e2 100644
--- a/gst-libs/gst/tuner/tunerchannel.c
+++ b/gst-libs/gst/tuner/tunerchannel.c
@@ -104,8 +104,10 @@ gst_tuner_channel_dispose (GObject * object)
 {
   GstTunerChannel *channel = GST_TUNER_CHANNEL (object);
 
-  if (channel->label)
+  if (channel->label) {
     g_free (channel->label);
+    channel->label = NULL;
+  }
 
   if (parent_class->dispose)
     parent_class->dispose (object);
diff --git a/gst-libs/gst/tuner/tunernorm.c b/gst-libs/gst/tuner/tunernorm.c
index 8fb98db7..2eb973de 100644
--- a/gst-libs/gst/tuner/tunernorm.c
+++ b/gst-libs/gst/tuner/tunernorm.c
@@ -88,8 +88,10 @@ gst_tuner_norm_dispose (GObject * object)
 {
   GstTunerNorm *norm = GST_TUNER_NORM (object);
 
-  if (norm->label)
+  if (norm->label) {
     g_free (norm->label);
+    norm->label = NULL;
+  }
 
   if (parent_class->dispose)
     parent_class->dispose (object);
diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.c b/gst-libs/gst/xwindowlistener/xwindowlistener.c
index 9963535c..ebbc9ac6 100644
--- a/gst-libs/gst/xwindowlistener/xwindowlistener.c
+++ b/gst-libs/gst/xwindowlistener/xwindowlistener.c
@@ -96,6 +96,7 @@ gst_x_window_listener_dispose (GObject * object)
 
   if (xwin->display_name) {
     g_free (xwin->display_name);
+    xwin->display_name = NULL;
   }
 
   if (parent_class->dispose) {