RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jpeg2000dec: cleanup properly after decoding errors 

Fixes memory leak in fate-redcode-demux.
This commit is contained in:
Janne Grunau 2013-05-06 22:27:33 +02:00
parent 851465f9d9
commit 45a1694fde
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/jpeg2000dec.c
View File

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