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

lavc/jpeg2000dec: Support reading 64-bit atom size. 

Fixes ticket #6935.
This commit is contained in:
Carl Eugen Hoyos 2017-12-27 23:18:58 +01:00
parent ad73b32d29
commit 658bdc6771
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/jpeg2000dec.c
View File

@ -2009,7 +2009,16 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s)
bytestream2_get_bytes_left(&s->g) >= 8) {
atom_size = bytestream2_get_be32u(&s->g);
atom = bytestream2_get_be32u(&s->g);
atom_end = bytestream2_tell(&s->g) + atom_size - 8;
if (atom_size == 1) {
if (bytestream2_get_be32u(&s->g)) {
avpriv_request_sample(s->avctx, "Huge atom");
return 0;
}
atom_size = bytestream2_get_be32u(&s->g);
atom_end = bytestream2_tell(&s->g) + atom_size - 16;
} else {
atom_end = bytestream2_tell(&s->g) + atom_size - 8;
}
if (atom == JP2_CODESTREAM)
return 1;