diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-23 04:12:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-05 01:39:20 +0200 |
| commit | 4ced30908fb7be270011dd6096809fe28b8a0e48 (patch) | |
| tree | ef4fa7f5bf24f54af093956036178d0b42c2ce79 /libavcodec | |
| parent | cb026ac30364db99faa39041f38b4671928c6cfe (diff) | |
| download | ffmpeg-4ced30908fb7be270011dd6096809fe28b8a0e48.tar.gz | |
avcodec/jpeg2000dec: make SOC finding code more robust
Fixes file from Ticket860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 8c0e6ffd66..e67f098a6d 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1615,6 +1615,9 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, bytestream2_seek(&s->g, 0, SEEK_SET); } + while (bytestream2_get_bytes_left(&s->g) >= 3 && bytestream2_peek_be16(&s->g) != JPEG2000_SOC) + bytestream2_skip(&s->g, 1); + if (bytestream2_get_be16u(&s->g) != JPEG2000_SOC) { av_log(avctx, AV_LOG_ERROR, "SOC marker not present\n"); ret = AVERROR_INVALIDDATA; |