mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 06:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

teletextdec: Fix leak and NULL pointer usage

Browse source 
Coverity CID #1341744
This commit is contained in:
Edward Hervey 2015-12-07 13:36:29 +01:00 committed by Edward Hervey
parent 8e0863bf16
commit 16db86c1be
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/teletextdec/gstteletextdec.c
View file

@ -178,6 +178,7 @@ static gboolean gst_teletextdec_extract_data_units (GstTeletextDec *
static void gst_teletextdec_zvbi_init (GstTeletextDec * teletext); static void gst_teletextdec_zvbi_init (GstTeletextDec * teletext);
static void gst_teletextdec_zvbi_clear (GstTeletextDec * teletext); static void gst_teletextdec_zvbi_clear (GstTeletextDec * teletext);
static void gst_teletextdec_reset_frame (GstTeletextDec * teletext);
/* initialize the gstteletext's class */ /* initialize the gstteletext's class */
static void static void
@ -273,10 +274,7 @@ gst_teletextdec_init (GstTeletextDec * teletext)
teletext->queue = NULL; teletext->queue = NULL;
g_mutex_init (&teletext->queue_lock); g_mutex_init (&teletext->queue_lock);
teletext->frame = g_new0 (GstTeletextFrame, 1); gst_teletextdec_reset_frame (teletext);
teletext->frame->sliced_begin = g_new (vbi_sliced, MAX_SLICES);
teletext->frame->current_slice = teletext->frame->sliced_begin;
teletext->frame->sliced_end = teletext->frame->sliced_begin + MAX_SLICES;
teletext->last_ts = 0; teletext->last_ts = 0;
@ -326,6 +324,8 @@ gst_teletextdec_zvbi_clear (GstTeletextDec * teletext)
teletext->decoder = NULL; teletext->decoder = NULL;
} }
if (teletext->frame != NULL) { if (teletext->frame != NULL) {
if (teletext->frame->sliced_begin)
g_free (teletext->frame->sliced_begin);
g_free (teletext->frame); g_free (teletext->frame);
teletext->frame = NULL; teletext->frame = NULL;
} }
@ -500,6 +500,10 @@ gst_teletextdec_change_state (GstElement * element, GstStateChange transition)
static void static void
gst_teletextdec_reset_frame (GstTeletextDec * teletext) gst_teletextdec_reset_frame (GstTeletextDec * teletext)
{ {
if (teletext->frame == NULL)
teletext->frame = g_new0 (GstTeletextFrame, 1);
if (teletext->frame->sliced_begin == NULL)
teletext->frame->sliced_begin = g_new (vbi_sliced, MAX_SLICES);
teletext->frame->current_slice = teletext->frame->sliced_begin; teletext->frame->current_slice = teletext->frame->sliced_begin;
teletext->frame->sliced_end = teletext->frame->sliced_begin + MAX_SLICES; teletext->frame->sliced_end = teletext->frame->sliced_begin + MAX_SLICES;
teletext->frame->last_field = 0; teletext->frame->last_field = 0;
@ -518,9 +522,8 @@ gst_teletextdec_process_telx_buffer (GstTeletextDec * teletext, GstBuffer * buf)
teletext->in_timestamp = GST_BUFFER_TIMESTAMP (buf); teletext->in_timestamp = GST_BUFFER_TIMESTAMP (buf);
teletext->in_duration = GST_BUFFER_DURATION (buf); teletext->in_duration = GST_BUFFER_DURATION (buf);
if (teletext->frame == NULL) { if (teletext->frame == NULL)
gst_teletextdec_reset_frame (teletext); gst_teletextdec_reset_frame (teletext);
}
while (offset < buf_map.size) { while (offset < buf_map.size) {
res = res =
@ -820,13 +823,6 @@ fetch_page_failed:
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
} }
alloc_failed:
{
GST_ERROR_OBJECT (teletext, "Error allocating output buffer, reason %s",
gst_flow_get_name (ret));
return ret;
}
push_failed: push_failed:
{ {
GST_ERROR_OBJECT (teletext, "Pushing buffer failed, reason %s", GST_ERROR_OBJECT (teletext, "Pushing buffer failed, reason %s",