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

avcodec/jpeg2000_parser: Fix skipping of JP2 info markers by correctly reading marker size 

Signed-off-by: Shaun Simpson <shauns2029@gmail.com>
This commit is contained in:
Shaun Simpson 2021-07-21 14:15:45 +01:00 committed by Paul B Mahol
parent 01284c01c1
commit 16102cada5
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/jpeg2000_parser.c
View File

@ -82,7 +82,7 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
{
ParseContext *pc= &m->pc;
int i;
uint32_t state;
uint32_t state, next_state;
uint64_t state64;
state= pc->state;
state64 = pc->state64;
@ -143,7 +143,17 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_
} else if (m->in_codestream && (state & 0xFFFF) == 0xFF90) { // Are we in tile part header?
m->read_tp = 8;
} else if (pc->frame_start_found && info_marker((state & 0xFFFF0000)>>16) && m->in_codestream) {
m->skip_bytes = (state & 0xFFFF) - 2;
// Calculate number of bytes to skip to get to end of the next marker.
m->skip_bytes = (state & 0xFFFF)-1;
// If the next marker is an info marker, skip to the end of of the marker length.
if (i + m->skip_bytes + 1 < buf_size) {
next_state = (buf[i + m->skip_bytes] << 8) | buf[i + m->skip_bytes + 1];
if (info_marker(next_state)) {
// Skip an additional 2 bytes to get to the end of the marker length.
m->skip_bytes += 2;
}
}
}
}