mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegts: No need to check for NULL before calling g_free()

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=732789
This commit is contained in:
Sebastian Rasmussen 2014-07-06 01:55:50 +02:00 committed by Edward Hervey
parent 66c38b50f3
commit fba6ebaae2
4 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/mpegts/gst-atsc-section.c
View file

@ -411,8 +411,7 @@ _gst_mpegts_atsc_string_segment_copy (GstMpegtsAtscStringSegment * seg)
static void
_gst_mpegts_atsc_string_segment_free (GstMpegtsAtscStringSegment * seg)
{
if (seg->cached_string)
g_free (seg->cached_string);
g_free (seg->cached_string);
g_slice_free (GstMpegtsAtscStringSegment, seg);
}

14
gst-libs/gst/mpegts/gst-dvb-descriptor.c
View file

@ -522,10 +522,8 @@ gst_mpegts_descriptor_from_dvb_service (GstMpegtsDVBServiceType service_type,
memcpy (data, conv_service_name, service_size);
beach:
if (conv_service_name)
g_free (conv_service_name);
if (conv_provider_name)
g_free (conv_provider_name);
g_free (conv_service_name);
g_free (conv_provider_name);
return descriptor;
}
@ -1138,12 +1136,8 @@ _gst_mpegts_dvb_component_descriptor_copy (GstMpegtsComponentDescriptor *
void
gst_mpegts_dvb_component_descriptor_free (GstMpegtsComponentDescriptor * source)
{
if (source->language_code)
g_free (source->language_code);
if (source->text)
g_free (source->text);
g_free (source->language_code);
g_free (source->text);
g_slice_free (GstMpegtsComponentDescriptor, source);
}

6
gst-libs/gst/mpegts/gstmpegtsdescriptor.c
View file

@ -338,8 +338,7 @@ out:
if (error) {
GST_WARNING ("Could not convert from utf-8: %s", error->message);
g_error_free (error);
if (out_text)
g_free (out_text);
g_free (out_text);
return NULL;
}
@ -571,8 +570,7 @@ get_encoding_and_convert (const gchar * text, guint length)
giconv, is_multibyte, &error);
if (error != NULL) {
GST_WARNING ("Could not convert string: %s", error->message);
if (converted_str)
g_free (converted_str);
g_free (converted_str);
g_error_free (error);
error = NULL;

3
gst-libs/gst/mpegts/gstmpegtssection.c
View file

@ -184,8 +184,7 @@ _gst_mpegts_section_free (GstMpegtsSection * section)
if (section->cached_parsed && section->destroy_parsed)
section->destroy_parsed (section->cached_parsed);
if (section->data)
g_free (section->data);
g_free (section->data);
g_slice_free (GstMpegtsSection, section);
}