mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: fix memory leak

Browse source 
Don't leak result of gst_adapter_take(). There are most likely
smarter things we can do, but let's keep things simple for the
release.

Fixes #623172.
This commit is contained in:
Tim-Philipp Müller 2010-06-29 23:18:23 +01:00
parent fcf1995020
commit 7cbfe3eae1
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/jpeg/gstjpegdec.c
View file

@ -215,7 +215,10 @@ gst_jpeg_dec_fill_input_buffer (j_decompress_ptr cinfo)
av = dec->rem_img_len; av = dec->rem_img_len;
dec->rem_img_len -= av; dec->rem_img_len -= av;
cinfo->src->next_input_byte = gst_adapter_take (dec->adapter, av); g_free (dec->cur_buf);
dec->cur_buf = gst_adapter_take (dec->adapter, av);
cinfo->src->next_input_byte = dec->cur_buf;
cinfo->src->bytes_in_buffer = av; cinfo->src->bytes_in_buffer = av;
return TRUE; return TRUE;
@ -1538,6 +1541,8 @@ gst_jpeg_dec_sink_event (GstPad * pad, GstEvent * event)
jpeg_abort_decompress (&dec->cinfo); jpeg_abort_decompress (&dec->cinfo);
gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED);
gst_adapter_clear (dec->adapter); gst_adapter_clear (dec->adapter);
g_free (dec->cur_buf);
dec->cur_buf = NULL;
dec->parse_offset = 0; dec->parse_offset = 0;
dec->parse_entropy_len = 0; dec->parse_entropy_len = 0;
dec->parse_resync = FALSE; dec->parse_resync = FALSE;
@ -1631,6 +1636,7 @@ gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition)
dec->parse_offset = 0; dec->parse_offset = 0;
dec->parse_entropy_len = 0; dec->parse_entropy_len = 0;
dec->parse_resync = FALSE; dec->parse_resync = FALSE;
dec->cur_buf = NULL;
gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&dec->segment, GST_FORMAT_UNDEFINED);
gst_jpeg_dec_reset_qos (dec); gst_jpeg_dec_reset_qos (dec);
default: default:
@ -1644,6 +1650,8 @@ gst_jpeg_dec_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
gst_adapter_clear (dec->adapter); gst_adapter_clear (dec->adapter);
g_free (dec->cur_buf);
dec->cur_buf = NULL;
gst_jpeg_dec_free_buffers (dec); gst_jpeg_dec_free_buffers (dec);
break; break;
default: default:

2
ext/jpeg/gstjpegdec.h
View file

@ -72,6 +72,8 @@ struct _GstJpegDec {
GstAdapter *adapter; GstAdapter *adapter;
guint8 *cur_buf;
/* TRUE if each input buffer contains a whole jpeg image */ /* TRUE if each input buffer contains a whole jpeg image */
gboolean packetized; gboolean packetized;