Remove unnecessary NULL checks before g_free()

g_free() is NULL-safe

6 files changed, 9 insertions, 18 deletions

diff --git a/gst/audiovisualizers/gstwavescope.c b/gst/audiovisualizers/gstwavescope.c
index b87d05cf8..4b7fe3aac 100644
--- a/gst/audiovisualizers/gstwavescope.c
+++ b/gst/audiovisualizers/gstwavescope.c
@@ -176,8 +176,7 @@ gst_wave_scope_setup (GstAudioVisualizer * bscope)
 {
   GstWaveScope *scope = GST_WAVE_SCOPE (bscope);
 
-  if (scope->flt)
-    g_free (scope->flt);
+  g_free (scope->flt);
 
   scope->flt = g_new0 (gdouble, 6 * GST_AUDIO_INFO_CHANNELS (&bscope->ainfo));
 
diff --git a/gst/dvbsuboverlay/dvb-sub.c b/gst/dvbsuboverlay/dvb-sub.c
index 65a43abda..75965631a 100644
--- a/gst/dvbsuboverlay/dvb-sub.c
+++ b/gst/dvbsuboverlay/dvb-sub.c
@@ -277,8 +277,7 @@ delete_state (DvbSub * dvb_sub)
     dvb_sub->region_list = region->next;
 
     delete_region_display_list (dvb_sub, region);
-    if (region->pbuf)
-      g_free (region->pbuf);
+    g_free (region->pbuf);
 
     g_slice_free (DVBSubRegion, region);
   }
@@ -472,8 +471,7 @@ _dvb_sub_parse_region_segment (DvbSub * dvb_sub, guint16 page_id, guint8 * buf,
   buf += 2;
 
   if (region->width * region->height != region->buf_size) {     /* FIXME: Read closer from spec what happens when dimensions change */
-    if (region->pbuf)
-      g_free (region->pbuf);
+    g_free (region->pbuf);
 
     region->buf_size = region->width * region->height;
 
diff --git a/gst/librfb/rfbdecoder.c b/gst/librfb/rfbdecoder.c
index 88f3b0382..bd225ada7 100644
--- a/gst/librfb/rfbdecoder.c
+++ b/gst/librfb/rfbdecoder.c
@@ -89,8 +89,7 @@ rfb_decoder_free (RfbDecoder * decoder)
 
   g_clear_error (&decoder->error);
 
-  if (decoder->data)
-    g_free (decoder->data);
+  g_free (decoder->data);
 
   g_free (decoder);
 }
@@ -234,8 +233,7 @@ rfb_decoder_read (RfbDecoder * decoder, guint32 len)
   g_return_val_if_fail (len > 0, NULL);
 
   if (G_UNLIKELY (len > decoder->data_len)) {
-    if (decoder->data)
-      g_free (decoder->data);
+    g_free (decoder->data);
     decoder->data = g_malloc (len);
     decoder->data_len = len;
   }
diff --git a/gst/mpegtsdemux/mpegtspacketizer.c b/gst/mpegtsdemux/mpegtspacketizer.c
index ce417c335..3e348a64c 100644
--- a/gst/mpegtsdemux/mpegtspacketizer.c
+++ b/gst/mpegtsdemux/mpegtspacketizer.c
@@ -212,8 +212,7 @@ mpegts_packetizer_clear_section (MpegTSPacketizerStream * stream)
   stream->section_length = 0;
   stream->section_offset = 0;
   stream->table_id = TABLE_ID_UNSET;
-  if (stream->section_data)
-    g_free (stream->section_data);
+  g_free (stream->section_data);
   stream->section_data = NULL;
 }
 
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index f1045da22..fb8e6ac34 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -1579,8 +1579,7 @@ done:
     gst_pad_set_event_function (pad, gst_ts_demux_srcpad_event);
   }
 
-  if (name)
-    g_free (name);
+  g_free (name);
   if (template)
     gst_object_unref (template);
   if (caps)
@@ -1714,8 +1713,7 @@ gst_ts_demux_stream_flush (TSDemuxStream * stream, GstTSDemux * tsdemux,
 {
   GST_DEBUG ("flushing stream %p", stream);
 
-  if (stream->data)
-    g_free (stream->data);
+  g_free (stream->data);
   stream->data = NULL;
   stream->state = PENDING_PACKET_EMPTY;
   stream->expected_size = 0;
diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c
index 293aed943..00e1203e9 100644
--- a/gst/mpegtsmux/tsmux/tsmux.c
+++ b/gst/mpegtsmux/tsmux/tsmux.c
@@ -934,8 +934,7 @@ tsmux_section_write_packet (GstMpegtsSectionType * type,
   return TRUE;
 
 fail:
-  if (packet)
-    g_free (packet);
+  g_free (packet);
   if (section_buffer)
     gst_buffer_unref (section_buffer);
   return FALSE;