virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/huffyuvdec: fix mem leak in case of init failure

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
This commit is contained in:
Lukasz Marek
2014-11-23 00:57:33 +01:00
parent 02cb7d4c9c
commit c9d39fc8c6
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libavcodec/huffyuvdec.c
View File

@@ -272,6 +272,20 @@ static int read_old_huffman_tables(HYuvContext *s)
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx)
{
HYuvContext *s = avctx->priv_data;
int i;
ff_huffyuv_common_end(s);
av_freep(&s->bitstream_buffer);
for (i = 0; i < 8; i++)
ff_free_vlc(&s->vlc[i]);
return 0;
}
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;
@@ -327,7 +341,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if ((ret = read_huffman_tables(s, avctx->extradata + 4, if ((ret = read_huffman_tables(s, avctx->extradata + 4,
avctx->extradata_size - 4)) < 0) avctx->extradata_size - 4)) < 0)
return ret; goto error;
} else { } else {
switch (avctx->bits_per_coded_sample & 7) { switch (avctx->bits_per_coded_sample & 7) {
case 1: case 1:
@@ -355,7 +369,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->context = 0; s->context = 0;
if ((ret = read_old_huffman_tables(s)) < 0) if ((ret = read_old_huffman_tables(s)) < 0)
return ret; goto error;
} }
if (s->version <= 2) { if (s->version <= 2) {
@@ -383,7 +397,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
s->alpha = 1; s->alpha = 1;
break; break;
default: default:
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto error;
} }
av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt,
&s->chroma_h_shift, &s->chroma_h_shift,
@@ -520,7 +535,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUVA420P16; avctx->pix_fmt = AV_PIX_FMT_YUVA420P16;
break; break;
default: default:
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto error;
} }
} }
@@ -528,21 +544,26 @@ static av_cold int decode_init(AVCodecContext *avctx)
if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV420P) && avctx->width & 1) { if ((avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV420P) && avctx->width & 1) {
av_log(avctx, AV_LOG_ERROR, "width must be even for this colorspace\n"); av_log(avctx, AV_LOG_ERROR, "width must be even for this colorspace\n");
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto error;
} }
if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P && if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P &&
avctx->width % 4) { avctx->width % 4) {
av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 " av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 "
"for this combination of colorspace and predictor type.\n"); "for this combination of colorspace and predictor type.\n");
return AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto error;
} }
if ((ret = ff_huffyuv_alloc_temp(s)) < 0) { if ((ret = ff_huffyuv_alloc_temp(s)) < 0) {
ff_huffyuv_common_end(s); ff_huffyuv_common_end(s);
return ret; goto error;
} }
return 0; return 0;
error:
decode_end(avctx);
return ret;
} }
static av_cold int decode_init_thread_copy(AVCodecContext *avctx) static av_cold int decode_init_thread_copy(AVCodecContext *avctx)
@@ -1209,20 +1230,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return (get_bits_count(&s->gb) + 31) / 32 * 4 + table_size; return (get_bits_count(&s->gb) + 31) / 32 * 4 + table_size;
} }
static av_cold int decode_end(AVCodecContext *avctx)
{
HYuvContext *s = avctx->priv_data;
int i;
ff_huffyuv_common_end(s);
av_freep(&s->bitstream_buffer);
for (i = 0; i < 8; i++)
ff_free_vlc(&s->vlc[i]);
return 0;
}
AVCodec ff_huffyuv_decoder = { AVCodec ff_huffyuv_decoder = {
.name = "huffyuv", .name = "huffyuv",
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),