RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-30 19:34:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'

Browse Source 
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
  indeo: Sanitize ff_ivi_init_planes fail paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-15 13:24:58 +02:00
commit 8e4ecd8774
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/indeo4.c
View File

@ -210,6 +210,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) { if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) {
if (ff_ivi_init_planes(ctx->planes, &pic_conf)) { if (ff_ivi_init_planes(ctx->planes, &pic_conf)) {
av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n"); av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n");
ctx->pic_conf.luma_bands = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }

4
libavcodec/indeo5.c
View File

@ -113,7 +113,7 @@ static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx)
} }
/* check if picture layout was changed and reallocate buffers */ /* check if picture layout was changed and reallocate buffers */
if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) { if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf) || ctx->gop_invalid) {
result = ff_ivi_init_planes(ctx->planes, &pic_conf); result = ff_ivi_init_planes(ctx->planes, &pic_conf);
if (result < 0) { if (result < 0) {
av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n"); av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n");
@ -327,9 +327,9 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx)
ctx->frame_num = get_bits(&ctx->gb, 8); ctx->frame_num = get_bits(&ctx->gb, 8);
if (ctx->frame_type == FRAMETYPE_INTRA) { if (ctx->frame_type == FRAMETYPE_INTRA) {
ctx->gop_invalid = 1;
if ((ret = decode_gop_header(ctx, avctx)) < 0) { if ((ret = decode_gop_header(ctx, avctx)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n"); av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n");
ctx->gop_invalid = 1;
return ret; return ret;
} }
ctx->gop_invalid = 0; ctx->gop_invalid = 0;

5
libavcodec/ivi_common.c
View File

@ -242,6 +242,7 @@ static av_cold void ivi_free_buffers(IVIPlaneDesc *planes)
av_freep(&planes[p].bands[b].tiles); av_freep(&planes[p].bands[b].tiles);
} }
av_freep(&planes[p].bands); av_freep(&planes[p].bands);
planes[p].num_bands = 0;
} }
} }
@ -254,6 +255,10 @@ av_cold int ff_ivi_init_planes(IVIPlaneDesc *planes, const IVIPicConfig *cfg)
ivi_free_buffers(planes); ivi_free_buffers(planes);
if (cfg->pic_width < 1 || cfg->pic_height < 1 ||
cfg->luma_bands < 1 || cfg->chroma_bands < 1)
return AVERROR_INVALIDDATA;
/* fill in the descriptor of the luminance plane */ /* fill in the descriptor of the luminance plane */
planes[0].width = cfg->pic_width; planes[0].width = cfg->pic_width;
planes[0].height = cfg->pic_height; planes[0].height = cfg->pic_height;