Remove unnecessary NULL checks before g_free()

g_free() is NULL-safe
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-11-17 15:23:17 -08:00
parent 87b5ad0dfc
commit 86ec812429
48 changed files with 73 additions and 151 deletions

View File

@ -217,7 +217,6 @@ gst_afsink_set_property (GObject * object, guint prop_id, const GValue * value,
/* the element must be stopped or paused in order to do this */
g_return_if_fail ((GST_STATE (sink) < GST_STATE_PLAYING)
|| (GST_STATE (sink) == GST_STATE_PAUSED));
if (sink->filename)
g_free (sink->filename);
sink->filename = g_strdup (g_value_get_string (value));
if ((GST_STATE (sink) == GST_STATE_PAUSED)

View File

@ -250,7 +250,6 @@ gst_afsrc_set_property (GObject * object, guint prop_id, const GValue * value,
switch (prop_id) {
case ARG_LOCATION:
if (src->filename)
g_free (src->filename);
src->filename = g_strdup (g_value_get_string (value));
break;

View File

@ -3366,7 +3366,6 @@ combine_urls (GstUri * base, GList * list, gchar ** query, guint idx)
gst_uri_unref (base);
if (ret && query) {
if (*query)
g_free (*query);
*query = gst_uri_get_query_string (ret);
if (*query) {

View File

@ -329,7 +329,6 @@ gst_gl_bumper_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_LOCATION:
if (bumper->location != NULL)
g_free (bumper->location);
bumper->location = g_value_dup_string (value);
break;

View File

@ -236,7 +236,6 @@ gst_gl_differencematte_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_LOCATION:
if (differencematte->location != NULL)
g_free (differencematte->location);
differencematte->bg_has_changed = TRUE;
differencematte->location = g_value_dup_string (value);

View File

@ -164,11 +164,9 @@ gst_gl_filtershader_finalize (GObject * object)
{
GstGLFilterShader *filtershader = GST_GL_FILTERSHADER (object);
if (filtershader->vertex)
g_free (filtershader->vertex);
filtershader->vertex = NULL;
if (filtershader->fragment)
g_free (filtershader->fragment);
filtershader->fragment = NULL;
@ -195,7 +193,6 @@ gst_gl_filtershader_set_property (GObject * object, guint prop_id,
break;
case PROP_VERTEX:
GST_OBJECT_LOCK (filtershader);
if (filtershader->vertex)
g_free (filtershader->vertex);
filtershader->vertex = g_value_dup_string (value);
filtershader->new_source = TRUE;
@ -203,7 +200,6 @@ gst_gl_filtershader_set_property (GObject * object, guint prop_id,
break;
case PROP_FRAGMENT:
GST_OBJECT_LOCK (filtershader);
if (filtershader->fragment)
g_free (filtershader->fragment);
filtershader->fragment = g_value_dup_string (value);
filtershader->new_source = TRUE;

View File

@ -277,7 +277,6 @@ gst_gl_overlay_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_LOCATION:
if (overlay->location != NULL)
g_free (overlay->location);
overlay->location_has_changed = TRUE;
overlay->location = g_value_dup_string (value);

View File

@ -674,10 +674,8 @@ gst_hls_demux_update_fragment_info (GstAdaptiveDemuxStream * stream)
stream->fragment.timestamp = GST_CLOCK_TIME_NONE;
}
if (hlsdemux->current_key)
g_free (hlsdemux->current_key);
hlsdemux->current_key = key;
if (hlsdemux->current_iv)
g_free (hlsdemux->current_iv);
hlsdemux->current_iv = iv;
g_free (stream->fragment.uri);

View File

@ -791,11 +791,8 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf)
kbitmap = (kate_bitmap *) g_malloc (sizeof (kate_bitmap));
kpalette = (kate_palette *) g_malloc (sizeof (kate_palette));
if (!kregion || !kpalette || !kbitmap) {
if (kregion)
g_free (kregion);
if (kbitmap)
g_free (kbitmap);
if (kpalette)
g_free (kpalette);
GST_ELEMENT_ERROR (ke, STREAM, ENCODE, (NULL), ("Out of memory"));
return GST_FLOW_ERROR;

View File

@ -911,7 +911,6 @@ gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev)
error:
kate_tracker_clear (&kin);
if (bytes)
g_free (bytes);
return NULL;
}

View File

@ -371,10 +371,8 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder,
}
/* update properties */
if (decoder->language)
g_free (decoder->language);
decoder->language = g_strdup (decoder->k.ki->language);
if (decoder->category)
g_free (decoder->category);
decoder->category = g_strdup (decoder->k.ki->category);
decoder->original_canvas_width = decoder->k.ki->original_canvas_width;

View File

@ -609,7 +609,6 @@ gst_mms_uri_set_uri (GstURIHandler * handler, const gchar * uri,
}
GST_OBJECT_LOCK (src);
if (src->uri_name)
g_free (src->uri_name);
src->uri_name = fixed_uri;
GST_OBJECT_UNLOCK (src);

View File

@ -321,7 +321,6 @@ gst_neonhttp_src_set_property (GObject * object, guint prop_id,
break;
}
case PROP_USER_AGENT:
if (src->user_agent)
g_free (src->user_agent);
src->user_agent = g_strdup (g_value_get_string (value));
break;

View File

@ -1091,7 +1091,6 @@ done:
if (bdata)
gst_buffer_unmap (buf, &map);
if (mdata)
g_free (mdata);
return ret;

View File

@ -148,7 +148,6 @@ gst_sf_sink_set_location (GstSFSink * this, const gchar * location)
if (this->file)
goto was_open;
if (this->location)
g_free (this->location);
this->location = location ? g_strdup (location) : NULL;

View File

@ -146,7 +146,6 @@ gst_sf_src_set_location (GstSFSrc * this, const gchar * location)
if (this->file)
goto was_open;
if (this->location)
g_free (this->location);
this->location = location ? g_strdup (location) : NULL;

View File

@ -328,19 +328,12 @@ spc_tag_get_info (guchar * data, guint length, spc_tag_info * info)
void
spc_tag_free (spc_tag_info * info)
{
if (info->title)
g_free (info->title);
if (info->game)
g_free (info->game);
if (info->artist)
g_free (info->artist);
if (info->album)
g_free (info->album);
if (info->publisher)
g_free (info->publisher);
if (info->comment)
g_free (info->comment);
if (info->dumper)
g_free (info->dumper);
if (info->dump_date)
g_date_free (info->dump_date);

View File

@ -588,7 +588,6 @@ gst_timidity_loop (GstPad * sinkpad)
goto paused;
}
if (timidity->mididata)
g_free (timidity->mididata);
timidity->mididata = g_malloc (timidity->mididata_size);

View File

@ -219,7 +219,6 @@ gst_wayland_sink_finalize (GObject * object)
if (sink->pool)
gst_object_unref (sink->pool);
if (sink->display_name)
g_free (sink->display_name);
g_mutex_clear (&sink->display_lock);

View File

@ -189,7 +189,6 @@ _gst_gl_feature_check (GstGLContext * context,
for (func_num = 0; data->functions[func_num].name; func_num++) {
void *func;
if (full_function_name)
g_free (full_function_name);
full_function_name = g_strconcat ("gl", data->functions[func_num].name,

View File

@ -312,7 +312,6 @@ gst_glsl_stage_set_strings (GstGLSLStage * stage, GstGLSLVersion version,
if (stage->priv->n_strings < n_strings) {
/* only realloc if we need more space */
if (stage->priv->strings)
g_free (stage->priv->strings);
stage->priv->strings = g_new0 (gchar *, n_strings);
}

View File

@ -461,7 +461,6 @@ gst_gl_context_set_error (GstGLContext * context, const char *format, ...)
{
va_list args;
if (error_message)
g_free (error_message);
va_start (args, format);

View File

@ -55,7 +55,6 @@ gst_gl_display_x11_finalize (GObject * object)
{
GstGLDisplayX11 *display_x11 = GST_GL_DISPLAY_X11 (object);
if (display_x11->name)
g_free (display_x11->name);
if (!display_x11->foreign_display && display_x11->display) {

View File

@ -176,7 +176,6 @@ gst_wave_scope_setup (GstAudioVisualizer * bscope)
{
GstWaveScope *scope = GST_WAVE_SCOPE (bscope);
if (scope->flt)
g_free (scope->flt);
scope->flt = g_new0 (gdouble, 6 * GST_AUDIO_INFO_CHANNELS (&bscope->ainfo));

View File

@ -277,7 +277,6 @@ 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_slice_free (DVBSubRegion, region);
@ -472,7 +471,6 @@ _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);
region->buf_size = region->width * region->height;

View File

@ -89,7 +89,6 @@ rfb_decoder_free (RfbDecoder * decoder)
g_clear_error (&decoder->error);
if (decoder->data)
g_free (decoder->data);
g_free (decoder);
@ -234,7 +233,6 @@ 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);
decoder->data = g_malloc (len);
decoder->data_len = len;

View File

@ -212,7 +212,6 @@ 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);
stream->section_data = NULL;
}

View File

@ -1579,7 +1579,6 @@ done:
gst_pad_set_event_function (pad, gst_ts_demux_srcpad_event);
}
if (name)
g_free (name);
if (template)
gst_object_unref (template);
@ -1714,7 +1713,6 @@ gst_ts_demux_stream_flush (TSDemuxStream * stream, GstTSDemux * tsdemux,
{
GST_DEBUG ("flushing stream %p", stream);
if (stream->data)
g_free (stream->data);
stream->data = NULL;
stream->state = PENDING_PACKET_EMPTY;

View File

@ -934,7 +934,6 @@ tsmux_section_write_packet (GstMpegtsSectionType * type,
return TRUE;
fail:
if (packet)
g_free (packet);
if (section_buffer)
gst_buffer_unref (section_buffer);

View File

@ -261,9 +261,7 @@ acmenc_teardown (ACMEnc * enc)
gst_caps_unref (enc->output_caps);
enc->output_caps = NULL;
}
if (enc->header.pbSrc)
g_free (enc->header.pbSrc);
if (enc->header.pbDst)
g_free (enc->header.pbDst);
memset (&enc->header, 0, sizeof (enc->header));
if (enc->stream) {

View File

@ -201,9 +201,7 @@ acmmp3dec_teardown (ACMMP3Dec * dec)
if (dec->header.fdwStatus & ACMSTREAMHEADER_STATUSF_PREPARED)
acmStreamUnprepareHeader (dec->stream, &dec->header, 0);
if (dec->header.pbSrc)
g_free (dec->header.pbSrc);
if (dec->header.pbDst)
g_free (dec->header.pbDst);
memset (&dec->header, 0, sizeof (dec->header));

View File

@ -208,9 +208,7 @@ gst_avf_asset_src_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_URI:
if (self->uri) {
g_free (self->uri);
}
self->uri = g_value_dup_string (value);
break;
default:
@ -820,9 +818,7 @@ gst_avf_asset_src_uri_set_uri (GstURIHandler * handler, const gchar * uri, GErro
if (asset.playable) {
ret = TRUE;
if (self->uri) {
g_free (self->uri);
}
self->uri = g_strdup (uri);
} else {
g_set_error (error, GST_URI_ERROR, GST_URI_ERROR_BAD_URI,

View File

@ -157,7 +157,6 @@ gst_a2dp_sink_set_property (GObject * object, guint prop_id,
if (self->sink != NULL)
gst_avdtp_sink_set_device (self->sink, g_value_get_string (value));
if (self->device != NULL)
g_free (self->device);
self->device = g_value_dup_string (value);
break;
@ -166,7 +165,6 @@ gst_a2dp_sink_set_property (GObject * object, guint prop_id,
if (self->sink != NULL)
gst_avdtp_sink_set_transport (self->sink, g_value_get_string (value));
if (self->transport != NULL)
g_free (self->transport);
self->transport = g_value_dup_string (value);
break;

View File

@ -451,7 +451,6 @@ gst_avdtp_sink_get_link_mtu (GstAvdtpSink * sink)
void
gst_avdtp_sink_set_device (GstAvdtpSink * self, const gchar * dev)
{
if (self->conn.device != NULL)
g_free (self->conn.device);
GST_LOG_OBJECT (self, "Setting device: %s", dev);
@ -461,7 +460,6 @@ gst_avdtp_sink_set_device (GstAvdtpSink * self, const gchar * dev)
void
gst_avdtp_sink_set_transport (GstAvdtpSink * self, const gchar * trans)
{
if (self->conn.transport != NULL)
g_free (self->conn.transport);
GST_LOG_OBJECT (self, "Setting transport: %s", trans);

View File

@ -213,7 +213,6 @@ gst_avdtp_connection_reset (GstAvdtpConnection * conn)
void
gst_avdtp_connection_set_device (GstAvdtpConnection * conn, const char *device)
{
if (conn->device)
g_free (conn->device);
conn->device = g_strdup (device);
@ -223,7 +222,6 @@ void
gst_avdtp_connection_set_transport (GstAvdtpConnection * conn,
const char *transport)
{
if (conn->transport)
g_free (conn->transport);
conn->transport = g_strdup (transport);

View File

@ -854,7 +854,6 @@ dshowaudiodec_set_output_format (GstDshowAudioDec *adec)
static void
dshowadec_free_mediatype (AM_MEDIA_TYPE *mediatype)
{
if (mediatype->pbFormat)
g_free (mediatype->pbFormat);
g_free (mediatype);
}

View File

@ -845,7 +845,6 @@ end:
if (caps_out)
gst_caps_unref (caps_out);
gst_object_unref (vdec);
if (input_vheader)
g_free (input_vheader);
if (srcfilter)
srcfilter->Release();

View File

@ -271,13 +271,11 @@ gst_dshow_find_filter (CLSID input_majortype, CLSID input_subtype,
filter_temp->Release ();
}
if (friendly_name)
g_free (friendly_name);
moniker->Release ();
}
clean:
if (prefered_filter_upper)
g_free (prefered_filter_upper);
if (enum_moniker)
enum_moniker->Release ();

View File

@ -396,9 +396,7 @@ gst_dshowvideosrc_get_caps (GstBaseSrc * basesrc, GstCaps * filter)
}
}
if (unidevice) {
g_free (unidevice);
}
if (src->caps) {
GstCaps *caps;

View File

@ -285,7 +285,6 @@ gst_dshowvideosink_finalize (GObject * gobject)
{
GstDshowVideoSink *sink = GST_DSHOWVIDEOSINK (gobject);
if (sink->preferredrenderer)
g_free (sink->preferredrenderer);
/* signal the COM thread that it sould uninitialize COM */
@ -315,9 +314,7 @@ gst_dshowvideosink_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_RENDERER:
if (sink->preferredrenderer)
g_free (sink->preferredrenderer);
sink->preferredrenderer = g_value_dup_string (value);
break;
case PROP_KEEP_ASPECT_RATIO:

View File

@ -52,7 +52,6 @@ reset_state (CamSwClient * client)
if (client->sock)
close (client->sock);
if (client->sock_path)
g_free (client->sock_path);
}

View File

@ -597,7 +597,6 @@ dvb_base_bin_set_program_numbers (DvbBaseBin * dvbbasebin, const gchar * pn)
/* FIXME : Deactivate programs no longer selected */
if (dvbbasebin->program_numbers)
g_free (dvbbasebin->program_numbers);
dvbbasebin->program_numbers = g_strdup (pn);

View File

@ -180,7 +180,6 @@ no_channels:
static gboolean
remove_channel_from_hash (gpointer key, gpointer value, gpointer user_data)
{
if (key)
g_free (key);
if (value)
g_hash_table_destroy ((GHashTable *) value);

View File

@ -1316,10 +1316,7 @@ gst_pvrvideosink_dcontext_free (GstDrawContext * dcontext)
{
GST_DEBUG ("Freeing dcontext %p", dcontext);
if (dcontext->p_blt_info)
g_free (dcontext->p_blt_info);
if (dcontext->p_blt2d_info)
g_free (dcontext->p_blt2d_info);
if (dcontext->x_lock)

View File

@ -296,7 +296,6 @@ gst_uvc_h264_mjpg_demux_dispose (GObject * object)
if (self->priv->nv12_caps)
gst_caps_unref (self->priv->nv12_caps);
self->priv->nv12_caps = NULL;
if (self->priv->clock_samples)
g_free (self->priv->clock_samples);
self->priv->clock_samples = NULL;

View File

@ -222,7 +222,6 @@ _vdp_video_mem_free (GstAllocator * allocator, GstMemory * mem)
gst_object_unref (vmem->device);
if (vmem->cache)
g_free (vmem->cache);
g_slice_free (GstVdpVideoMemory, vmem);

View File

@ -233,7 +233,6 @@ _on_text_changed (GtkTextBuffer * text, struct text_view_state *state)
GtkTextIter start, end;
gtk_text_buffer_get_bounds (text, &start, &end);
if (state->str)
g_free (state->str);
state->str = gtk_text_buffer_get_text (text, &start, &end, FALSE);
g_object_set (state->state->shader, "update-shader", TRUE, NULL);

View File

@ -201,7 +201,6 @@ insert_tag_on_tree (const GstTagList * list, const gchar * tag,
gtk_tree_store_append (tree_store, &iter, NULL);
gtk_tree_store_set (tree_store, &iter, COL_TAG, tag, COL_VALUE, str, -1);
if (str)
g_free (str);
}