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

jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()

Browse Source 
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-06 22:06:15 +02:00
parent a82cc54fb5
commit 974420a701
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/jpeg2000dec.c
View File

@ -1288,26 +1288,29 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
return -1; return -1;
} }
if (ret = jpeg2000_read_main_headers(s)) if (ret = jpeg2000_read_main_headers(s))
return ret; goto fail;
/* get picture buffer */ /* get picture buffer */
if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) { if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n"); av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n");
return ret; goto fail;
} }
picture->pict_type = AV_PICTURE_TYPE_I; picture->pict_type = AV_PICTURE_TYPE_I;
picture->key_frame = 1; picture->key_frame = 1;
if (ret = jpeg2000_read_bitstream_packets(s)) if (ret = jpeg2000_read_bitstream_packets(s))
return ret; goto fail;
for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++)
if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture)) if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
return ret; goto fail;
jpeg2000_dec_cleanup(s); jpeg2000_dec_cleanup(s);
*got_frame = 1; *got_frame = 1;
return s->buf - s->buf_start; return s->buf - s->buf_start;
fail:
jpeg2000_dec_cleanup(s);
return ret;
} }
#define OFFSET(x) offsetof(Jpeg2000DecoderContext, x) #define OFFSET(x) offsetof(Jpeg2000DecoderContext, x)