[FFmpeg-cvslog] jpeg2000: Proper cleanup on failure in decode_frame()
Luca Barbato
git at videolan.org
Wed Jul 3 16:18:27 CEST 2013
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Mon Jul 1 10:01:28 2013 +0200| [daeb4e3042f2ecae2d41aaa4cae0bed932539788] | committer: Luca Barbato
jpeg2000: Proper cleanup on failure in decode_frame()
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daeb4e3042f2ecae2d41aaa4cae0bed932539788
---
libavcodec/jpeg2000.c | 4 +++-
libavcodec/jpeg2000dec.c | 16 ++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 66f7bed..bf46398 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -484,7 +484,9 @@ int ff_jpeg2000_init_component(Jpeg2000Component *comp,
void ff_jpeg2000_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
{
int reslevelno, bandno, precno;
- for (reslevelno = 0; reslevelno < codsty->nreslevels; reslevelno++) {
+ for (reslevelno = 0;
+ comp->reslevel && reslevelno < codsty->nreslevels;
+ reslevelno++) {
Jpeg2000ResLevel *reslevel = comp->reslevel + reslevelno;
for (bandno = 0; bandno < reslevel->nbands; bandno++) {
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 346a5c6..15dfc2b 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1346,8 +1346,10 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
bytestream2_init(&s->g, avpkt->data, avpkt->size);
s->curtileno = 0; // TODO: only one tile in DCI JP2K. to implement for more tiles
- if (bytestream2_get_bytes_left(&s->g) < 2)
- return AVERROR_INVALIDDATA;
+ if (bytestream2_get_bytes_left(&s->g) < 2) {
+ ret = AVERROR_INVALIDDATA;
+ goto end;
+ }
// check if the image is in jp2 format
if (bytestream2_get_bytes_left(&s->g) >= 12 &&
@@ -1357,17 +1359,17 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
if (!jp2_find_codestream(s)) {
av_log(avctx, AV_LOG_ERROR,
"Could not find Jpeg2000 codestream atom.\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto end;
}
} else {
bytestream2_seek(&s->g, 0, SEEK_SET);
- if (bytestream2_peek_be16(&s->g) != JPEG2000_SOC)
- bytestream2_skip(&s->g, 8);
}
if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) {
av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto end;
}
if (ret = jpeg2000_read_main_headers(s))
goto end;
@@ -1386,6 +1388,8 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
goto end;
+ jpeg2000_dec_cleanup(s);
+
*got_frame = 1;
return bytestream2_tell(&s->g);
More information about the ffmpeg-cvslog
mailing list