mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/jpeg/gstjpegdec.c: Fix invalid memory access for some odd-sized images (see image contained in quicktime stream i...

Browse source 
Original commit message from CVS:
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_decode_direct),
(gst_jpeg_dec_chain):
Fix invalid memory access for some odd-sized images
(see image contained in quicktime stream in #327083);
use g_malloc() instead of g_alloca().
This commit is contained in:
Tim-Philipp Müller 2006-02-17 17:54:05 +00:00
parent 027f62e625
commit b73f815176
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-02-17 Tim-Philipp Müller <tim at centricular dot net>
* ext/jpeg/gstjpegdec.c: (gst_jpeg_dec_decode_direct),
(gst_jpeg_dec_chain):
Fix invalid memory access for some odd-sized images
(see image contained in quicktime stream in #327083);
use g_malloc() instead of g_alloca().
2006-02-17 Wim Taymans <wim@fluendo.com> 2006-02-17 Wim Taymans <wim@fluendo.com>
* gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_chain): * gst/rtp/gstrtpamrdepay.c: (gst_rtp_amr_depay_chain):

15
ext/jpeg/gstjpegdec.c
View file

@ -655,12 +655,9 @@ gst_jpeg_dec_decode_direct (GstJpegDec * dec, guchar * base[3],
guchar **line[3]; /* the jpeg line buffer */ guchar **line[3]; /* the jpeg line buffer */
gint i, j, k; gint i, j, k;
line[0] = g_alloca ((r_v * DCTSIZE) * sizeof (guchar *)); line[0] = g_new0 (guchar *, (r_v * DCTSIZE));
line[1] = g_alloca ((r_v * DCTSIZE) * sizeof (guchar *)); line[1] = g_new0 (guchar *, (r_v * DCTSIZE));
line[2] = g_alloca ((r_v * DCTSIZE) * sizeof (guchar *)); line[2] = g_new0 (guchar *, (r_v * DCTSIZE));
memset (line[0], 0, (r_v * DCTSIZE) * sizeof (guchar *));
memset (line[1], 0, (r_v * DCTSIZE) * sizeof (guchar *));
memset (line[2], 0, (r_v * DCTSIZE) * sizeof (guchar *));
/* let jpeglib decode directly into our final buffer */ /* let jpeglib decode directly into our final buffer */
GST_DEBUG_OBJECT (dec, "decoding directly into output buffer"); GST_DEBUG_OBJECT (dec, "decoding directly into output buffer");
@ -685,6 +682,10 @@ gst_jpeg_dec_decode_direct (GstJpegDec * dec, guchar * base[3],
} }
jpeg_read_raw_data (&dec->cinfo, line, r_v * DCTSIZE); jpeg_read_raw_data (&dec->cinfo, line, r_v * DCTSIZE);
} }
g_free (line[0]);
g_free (line[1]);
g_free (line[2]);
} }
@ -864,7 +865,7 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf)
* copy over the data into our final picture buffer, otherwise jpeglib might * copy over the data into our final picture buffer, otherwise jpeglib might
* write over the end of a line into the beginning of the next line, * write over the end of a line into the beginning of the next line,
* resulting in blocky artifacts on the left side of the picture. */ * resulting in blocky artifacts on the left side of the picture. */
if ((I420_Y_ROWSTRIDE (width) % (dec->cinfo.max_h_samp_factor * DCTSIZE)) > 0) { if (width % (dec->cinfo.max_h_samp_factor * DCTSIZE) != 0) {
gst_jpeg_dec_decode_indirect (dec, base, last, width, height, r_v); gst_jpeg_dec_decode_indirect (dec, base, last, width, height, r_v);
} else { } else {
gst_jpeg_dec_decode_direct (dec, base, last, width, height, r_v); gst_jpeg_dec_decode_direct (dec, base, last, width, height, r_v);