virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mjpegdec: check h/v_count, fix context becoming inconsistent and causing out of array accesses.

Browse Source 
This also fixes a long standing comment in the code.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-11-30 03:58:38 +01:00
parent 08d0969c14
commit a2f680c7bc
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/mjpegdec.c
View File

@ -211,6 +211,8 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
int ff_mjpeg_decode_sof(MJpegDecodeContext *s) int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
{ {
int len, nb_components, i, width, height, pix_fmt_id; int len, nb_components, i, width, height, pix_fmt_id;
int h_count[MAX_COMPONENTS];
int v_count[MAX_COMPONENTS];
s->cur_scan = 0; s->cur_scan = 0;
s->upscale_h = s->upscale_v = 0; s->upscale_h = s->upscale_v = 0;
@ -264,19 +266,19 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->nb_components = nb_components; s->nb_components = nb_components;
s->h_max = 1; s->h_max = 1;
s->v_max = 1; s->v_max = 1;
memset(s->h_count, 0, sizeof(s->h_count)); memset(h_count, 0, sizeof(h_count));
memset(s->v_count, 0, sizeof(s->v_count)); memset(v_count, 0, sizeof(v_count));
for (i = 0; i < nb_components; i++) { for (i = 0; i < nb_components; i++) {
/* component id */ /* component id */
s->component_id[i] = get_bits(&s->gb, 8) - 1; s->component_id[i] = get_bits(&s->gb, 8) - 1;
s->h_count[i] = get_bits(&s->gb, 4); h_count[i] = get_bits(&s->gb, 4);
s->v_count[i] = get_bits(&s->gb, 4); v_count[i] = get_bits(&s->gb, 4);
/* compute hmax and vmax (only used in interleaved case) */ /* compute hmax and vmax (only used in interleaved case) */
if (s->h_count[i] > s->h_max) if (h_count[i] > s->h_max)
s->h_max = s->h_count[i]; s->h_max = h_count[i];
if (s->v_count[i] > s->v_max) if (v_count[i] > s->v_max)
s->v_max = s->v_count[i]; s->v_max = v_count[i];
if (!s->h_count[i] || !s->v_count[i]) { if (!h_count[i] || !v_count[i]) {
av_log(s->avctx, AV_LOG_ERROR, "h/v_count is 0\n"); av_log(s->avctx, AV_LOG_ERROR, "h/v_count is 0\n");
return -1; return -1;
} }
@ -284,7 +286,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if (s->quant_index[i] >= 4) if (s->quant_index[i] >= 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d quant:%d\n", av_log(s->avctx, AV_LOG_DEBUG, "component %d %d:%d id: %d quant:%d\n",
i, s->h_count[i], s->v_count[i], i, h_count[i], v_count[i],
s->component_id[i], s->quant_index[i]); s->component_id[i], s->quant_index[i]);
} }
@ -297,13 +299,17 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
s->rgb = 1; s->rgb = 1;
/* if different size, realloc/alloc picture */ /* if different size, realloc/alloc picture */
/* XXX: also check h_count and v_count */ if ( width != s->width || height != s->height
if (width != s->width || height != s->height) { || memcmp(s->h_count, h_count, sizeof(h_count[0])*nb_components)
|| memcmp(s->v_count, v_count, sizeof(v_count[0])*nb_components)) {
av_freep(&s->qscale_table); av_freep(&s->qscale_table);
s->width = width; s->width = width;
s->height = height; s->height = height;
memcpy(s->h_count, h_count, sizeof(h_count));
memcpy(s->v_count, v_count, sizeof(v_count));
s->interlaced = 0; s->interlaced = 0;
s->got_picture = 0;
/* test interlaced mode */ /* test interlaced mode */
if (s->first_picture && if (s->first_picture &&