generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '43d676432740c6d5e5234ed343f13902909fd124' into release/1.1

Browse Source 
* commit '43d676432740c6d5e5234ed343f13902909fd124':
  huffyuv: Check and propagate function return values

Conflicts:
	libavcodec/huffyuvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-08 14:38:20 +02:00
parent ae7ea2eabf 43d6764327
commit 451bc8ee2f
1 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
libavcodec/huffyuvdec.c
View File

@@ -107,11 +107,13 @@ static int read_len_table(uint8_t *dst, GetBitContext *gb)
return 0; return 0;
} }
static void generate_joint_tables(HYuvContext *s) static int generate_joint_tables(HYuvContext *s)
{ {
uint16_t symbols[1 << VLC_BITS]; uint16_t symbols[1 << VLC_BITS];
uint16_t bits[1 << VLC_BITS]; uint16_t bits[1 << VLC_BITS];
uint8_t len[1 << VLC_BITS]; uint8_t len[1 << VLC_BITS];
int ret;
if (s->bitstream_bpp < 24) { if (s->bitstream_bpp < 24) {
int p, i, y, u; int p, i, y, u;
for (p = 0; p < 3; p++) { for (p = 0; p < 3; p++) {
@@ -133,8 +135,9 @@ static void generate_joint_tables(HYuvContext *s)
} }
} }
ff_free_vlc(&s->vlc[3 + p]); ff_free_vlc(&s->vlc[3 + p]);
ff_init_vlc_sparse(&s->vlc[3 + p], VLC_BITS, i, len, 1, 1, if ((ret = ff_init_vlc_sparse(&s->vlc[3 + p], VLC_BITS, i, len, 1, 1,
bits, 2, 2, symbols, 2, 2, 0); bits, 2, 2, symbols, 2, 2, 0)) < 0)
return ret;
} }
} else { } else {
uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map; uint8_t (*map)[4] = (uint8_t(*)[4])s->pix_bgr_map;
@@ -176,31 +179,34 @@ static void generate_joint_tables(HYuvContext *s)
} }
} }
ff_free_vlc(&s->vlc[3]); ff_free_vlc(&s->vlc[3]);
init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1, bits, 2, 2, 0); if ((ret = init_vlc(&s->vlc[3], VLC_BITS, i, len, 1, 1,
bits, 2, 2, 0)) < 0)
return ret;
} }
return 0;
} }
static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length) static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length)
{ {
GetBitContext gb; GetBitContext gb;
int i; int i, ret;
int ret;
init_get_bits(&gb, src, length * 8); if ((ret = init_get_bits(&gb, src, length * 8)) < 0)
return ret;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (read_len_table(s->len[i], &gb) < 0) if ((ret = read_len_table(s->len[i], &gb)) < 0)
return -1; return ret;
if (ff_huffyuv_generate_bits_table(s->bits[i], s->len[i]) < 0) { if ((ret = ff_huffyuv_generate_bits_table(s->bits[i], s->len[i])) < 0)
return -1; return ret;
}
ff_free_vlc(&s->vlc[i]); ff_free_vlc(&s->vlc[i]);
if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1, if ((ret = init_vlc(&s->vlc[i], VLC_BITS, 256, s->len[i], 1, 1,
s->bits[i], 4, 4, 0)) < 0) s->bits[i], 4, 4, 0)) < 0)
return ret; return ret;
} }
generate_joint_tables(s); if ((ret = generate_joint_tables(s)) < 0)
return ret;
return (get_bits_count(&gb) + 7) / 8; return (get_bits_count(&gb) + 7) / 8;
} }
@@ -208,18 +214,19 @@ static int read_huffman_tables(HYuvContext *s, const uint8_t *src, int length)
static int read_old_huffman_tables(HYuvContext *s) static int read_old_huffman_tables(HYuvContext *s)
{ {
GetBitContext gb; GetBitContext gb;
int i; int i, ret;
int ret;
init_get_bits(&gb, classic_shift_luma, if ((ret = init_get_bits(&gb, classic_shift_luma,
classic_shift_luma_table_size * 8); classic_shift_luma_table_size * 8)) < 0)
if (read_len_table(s->len[0], &gb) < 0) return ret;
return -1; if ((ret = read_len_table(s->len[0], &gb)) < 0)
return ret;
init_get_bits(&gb, classic_shift_chroma, if ((ret = init_get_bits(&gb, classic_shift_chroma,
classic_shift_chroma_table_size * 8); classic_shift_chroma_table_size * 8)) < 0)
if (read_len_table(s->len[1], &gb) < 0) return ret;
return -1; if ((ret = read_len_table(s->len[1], &gb)) < 0)
return ret;
for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i]; for(i=0; i<256; i++) s->bits[0][i] = classic_add_luma [i];
for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i]; for(i=0; i<256; i++) s->bits[1][i] = classic_add_chroma[i];
@@ -238,7 +245,8 @@ static int read_old_huffman_tables(HYuvContext *s)
return ret; return ret;
} }
generate_joint_tables(s); if ((ret = generate_joint_tables(s)) < 0)
return ret;
return 0; return 0;
} }
@@ -246,6 +254,7 @@ static int read_old_huffman_tables(HYuvContext *s)
static av_cold int decode_init(AVCodecContext *avctx) static av_cold int decode_init(AVCodecContext *avctx)
{ {
HYuvContext *s = avctx->priv_data; HYuvContext *s = avctx->priv_data;
int ret;
ff_huffyuv_common_init(avctx); ff_huffyuv_common_init(avctx);
memset(s->vlc, 0, 3 * sizeof(VLC)); memset(s->vlc, 0, 3 * sizeof(VLC));
@@ -281,9 +290,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->interlaced = (interlace == 1) ? 1 : (interlace == 2) ? 0 : s->interlaced; s->interlaced = (interlace == 1) ? 1 : (interlace == 2) ? 0 : s->interlaced;
s->context = ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0; s->context = ((uint8_t*)avctx->extradata)[2] & 0x40 ? 1 : 0;
if ( read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4, if ((ret = read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size - 4) < 0) avctx->extradata_size - 4)) < 0)
return AVERROR_INVALIDDATA; return ret;
}else{ }else{
switch (avctx->bits_per_coded_sample & 7) { switch (avctx->bits_per_coded_sample & 7) {
case 1: case 1:
@@ -310,8 +319,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->bitstream_bpp = avctx->bits_per_coded_sample & ~7; s->bitstream_bpp = avctx->bits_per_coded_sample & ~7;
s->context = 0; s->context = 0;
if (read_old_huffman_tables(s) < 0) if ((ret = read_old_huffman_tables(s)) < 0)
return AVERROR_INVALIDDATA; return ret;
} }
switch (s->bitstream_bpp) { switch (s->bitstream_bpp) {
@@ -345,9 +354,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n"); av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (ff_huffyuv_alloc_temp(s)) { if ((ret = ff_huffyuv_alloc_temp(s)) < 0) {
ff_huffyuv_common_end(s); ff_huffyuv_common_end(s);
return AVERROR(ENOMEM); return ret;
} }
return 0; return 0;
@@ -356,24 +365,24 @@ static av_cold int decode_init(AVCodecContext *avctx)
static av_cold int decode_init_thread_copy(AVCodecContext *avctx) static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
{ {
HYuvContext *s = avctx->priv_data; HYuvContext *s = avctx->priv_data;
int i; int i, ret;
avctx->coded_frame= &s->picture; avctx->coded_frame= &s->picture;
if (ff_huffyuv_alloc_temp(s)) { if ((ret = ff_huffyuv_alloc_temp(s)) < 0) {
ff_huffyuv_common_end(s); ff_huffyuv_common_end(s);
return AVERROR(ENOMEM); return ret;
} }
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
s->vlc[i].table = NULL; s->vlc[i].table = NULL;
if (s->version == 2) { if (s->version == 2) {
if (read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4, if ((ret = read_huffman_tables(s, ((uint8_t*)avctx->extradata) + 4,
avctx->extradata_size) < 0) avctx->extradata_size)) < 0)
return AVERROR_INVALIDDATA; return ret;
} else { } else {
if (read_old_huffman_tables(s) < 0) if ((ret = read_old_huffman_tables(s)) < 0)
return AVERROR_INVALIDDATA; return ret;
} }
return 0; return 0;
@@ -532,14 +541,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (s->context) { if (s->context) {
table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size); table_size = read_huffman_tables(s, s->bitstream_buffer, buf_size);
if (table_size < 0) if (table_size < 0)
return AVERROR_INVALIDDATA; return table_size;
} }
if ((unsigned)(buf_size-table_size) >= INT_MAX / 8) if ((unsigned)(buf_size-table_size) >= INT_MAX / 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
init_get_bits(&s->gb, s->bitstream_buffer+table_size, if ((ret = init_get_bits(&s->gb, s->bitstream_buffer + table_size,
(buf_size-table_size) * 8); (buf_size - table_size) * 8)) < 0)
return ret;
fake_ystride = s->interlaced ? p->linesize[0] * 2 : p->linesize[0]; fake_ystride = s->interlaced ? p->linesize[0] * 2 : p->linesize[0];
fake_ustride = s->interlaced ? p->linesize[1] * 2 : p->linesize[1]; fake_ustride = s->interlaced ? p->linesize[1] * 2 : p->linesize[1];