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

Propagate error return values from the smacker decoder.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2013-06-29 16:02:43 +02:00
parent ac83d62136
commit a1dbe49d02
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/smacker.c
View File

@ -292,7 +292,7 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int
static int decode_header_trees(SmackVContext *smk) { static int decode_header_trees(SmackVContext *smk) {
GetBitContext gb; GetBitContext gb;
int mmap_size, mclr_size, full_size, type_size; int mmap_size, mclr_size, full_size, type_size, ret;
mmap_size = AV_RL32(smk->avctx->extradata); mmap_size = AV_RL32(smk->avctx->extradata);
mclr_size = AV_RL32(smk->avctx->extradata + 4); mclr_size = AV_RL32(smk->avctx->extradata + 4);
@ -307,8 +307,9 @@ static int decode_header_trees(SmackVContext *smk) {
smk->mmap_tbl[0] = 0; smk->mmap_tbl[0] = 0;
smk->mmap_last[0] = smk->mmap_last[1] = smk->mmap_last[2] = 1; smk->mmap_last[0] = smk->mmap_last[1] = smk->mmap_last[2] = 1;
} else { } else {
if (smacker_decode_header_tree(smk, &gb, &smk->mmap_tbl, smk->mmap_last, mmap_size)) ret = smacker_decode_header_tree(smk, &gb, &smk->mmap_tbl, smk->mmap_last, mmap_size);
return AVERROR_INVALIDDATA; if (ret < 0)
return ret;
} }
if(!get_bits1(&gb)) { if(!get_bits1(&gb)) {
av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n"); av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n");
@ -316,8 +317,9 @@ static int decode_header_trees(SmackVContext *smk) {
smk->mclr_tbl[0] = 0; smk->mclr_tbl[0] = 0;
smk->mclr_last[0] = smk->mclr_last[1] = smk->mclr_last[2] = 1; smk->mclr_last[0] = smk->mclr_last[1] = smk->mclr_last[2] = 1;
} else { } else {
if (smacker_decode_header_tree(smk, &gb, &smk->mclr_tbl, smk->mclr_last, mclr_size)) ret = smacker_decode_header_tree(smk, &gb, &smk->mclr_tbl, smk->mclr_last, mclr_size);
return AVERROR_INVALIDDATA; if (ret < 0)
return ret;
} }
if(!get_bits1(&gb)) { if(!get_bits1(&gb)) {
av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n"); av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n");
@ -325,8 +327,9 @@ static int decode_header_trees(SmackVContext *smk) {
smk->full_tbl[0] = 0; smk->full_tbl[0] = 0;
smk->full_last[0] = smk->full_last[1] = smk->full_last[2] = 1; smk->full_last[0] = smk->full_last[1] = smk->full_last[2] = 1;
} else { } else {
if (smacker_decode_header_tree(smk, &gb, &smk->full_tbl, smk->full_last, full_size)) ret = smacker_decode_header_tree(smk, &gb, &smk->full_tbl, smk->full_last, full_size);
return AVERROR_INVALIDDATA; if (ret < 0)
return ret;
} }
if(!get_bits1(&gb)) { if(!get_bits1(&gb)) {
av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n"); av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n");
@ -334,8 +337,9 @@ static int decode_header_trees(SmackVContext *smk) {
smk->type_tbl[0] = 0; smk->type_tbl[0] = 0;
smk->type_last[0] = smk->type_last[1] = smk->type_last[2] = 1; smk->type_last[0] = smk->type_last[1] = smk->type_last[2] = 1;
} else { } else {
if (smacker_decode_header_tree(smk, &gb, &smk->type_tbl, smk->type_last, type_size)) ret = smacker_decode_header_tree(smk, &gb, &smk->type_tbl, smk->type_last, type_size);
return AVERROR_INVALIDDATA; if (ret < 0)
return ret;
} }
return 0; return 0;
@ -528,6 +532,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
SmackVContext * const c = avctx->priv_data; SmackVContext * const c = avctx->priv_data;
int ret;
c->avctx = avctx; c->avctx = avctx;
@ -540,8 +545,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (decode_header_trees(c)) ret = decode_header_trees(c);
return AVERROR_INVALIDDATA; if (ret < 0)
return ret;
return 0; return 0;
} }