diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index 4cbe0cc403..a2957b0b71 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -2183,7 +2183,7 @@ static GstFlowReturn
 gst_ogg_demux_get_data (GstOggDemux * ogg, gint64 end_offset)
 {
   GstFlowReturn ret;
-  GstBuffer *buffer;
+  GstBuffer *buffer = NULL;
 
   GST_LOG_OBJECT (ogg,
       "get data %" G_GINT64_FORMAT " %" G_GINT64_FORMAT " %" G_GINT64_FORMAT,
@@ -4202,7 +4202,7 @@ static GstFlowReturn
 gst_ogg_demux_loop_forward (GstOggDemux * ogg)
 {
   GstFlowReturn ret;
-  GstBuffer *buffer;
+  GstBuffer *buffer = NULL;
 
   if (ogg->offset == ogg->length) {
     GST_LOG_OBJECT (ogg, "no more data to pull %" G_GINT64_FORMAT
diff --git a/gst-libs/gst/audio/gstaudiobasesink.c b/gst-libs/gst/audio/gstaudiobasesink.c
index c9f4743a3b..d93964625b 100644
--- a/gst-libs/gst/audio/gstaudiobasesink.c
+++ b/gst-libs/gst/audio/gstaudiobasesink.c
@@ -1999,7 +1999,7 @@ gst_audio_base_sink_callback (GstAudioRingBuffer * rbuf, guint8 * data,
 {
   GstBaseSink *basesink;
   GstAudioBaseSink *sink;
-  GstBuffer *buf;
+  GstBuffer *buf = NULL;
   GstFlowReturn ret;
   gsize size;
 
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 70baa52c25..5b03021bfd 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -64,6 +64,7 @@ gst_riff_read_chunk (GstElement * element,
 
 skip_junk:
   size = 8;
+  buf = NULL;
   if ((res = gst_pad_pull_range (pad, offset, size, &buf)) != GST_FLOW_OK)
     return res;
   else if (gst_buffer_get_size (buf) < size)
@@ -87,6 +88,7 @@ skip_junk:
     goto skip_junk;
   }
 
+  buf = NULL;
   if ((res = gst_pad_pull_range (pad, offset + 8, size, &buf)) != GST_FLOW_OK)
     return res;
   else if (gst_buffer_get_size (buf) < size)