mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: more sanity checks on input

Browse source 
Specifically, verify input components / colour space is as code
subsequently expects, thereby avoiding crashes or otherwise bogus output.
Presently, that means 3 components YCbCr colour space, and somewhat
limited sampling factors.

Fixes #600553.
This commit is contained in:
Mark Nauwelaerts 2010-04-30 12:42:42 +02:00
parent be5ffd96fe
commit cec48383b1
1 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ext/jpeg/gstjpegdec.c
View file

@ -1034,6 +1034,10 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf)
if (dec->cinfo.num_components > 3)
goto components_not_supported;
/* verify color space expectation to avoid going *boom* or bogus output */
if (dec->cinfo.jpeg_color_space != JCS_YCbCr)
goto unsupported_colorspace;
#ifndef GST_DISABLE_GST_DEBUG
{
gint i;
@ -1060,6 +1064,12 @@ gst_jpeg_dec_chain (GstPad * pad, GstBuffer * buf)
GST_WARNING_OBJECT (dec, "failed to start decompression cycle");
}
/* YUV sanity checks to get safe and reasonable I420 output */
g_assert (dec->cinfo.num_components == 3);
if (r_v > 2 || r_v < dec->cinfo.comp_info[0].v_samp_factor ||
r_h < dec->cinfo.comp_info[0].h_samp_factor)
goto invalid_yuv;
width = dec->cinfo.output_width;
height = dec->cinfo.output_height;
@ -1306,6 +1316,20 @@ components_not_supported:
ret = GST_FLOW_ERROR;
goto done;
}
unsupported_colorspace:
{
GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL),
("Picture has unknown or unsupported colourspace"));
ret = GST_FLOW_ERROR;
goto done;
}
invalid_yuv:
{
GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL),
("Picture is corrupt or unhandled YUV layout"));
ret = GST_FLOW_ERROR;
goto done;
}
}
static gboolean