From 8672c0a6436c9fc9d107617cf28cafe09ad3d9a5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 27 Jun 2015 11:48:42 +0200 Subject: avcodec/jpeg2000dec: Limit poc end fields to whats available in jpeg2000_decode_packets() Fixes: Ticket4677 Solution based on information from https://code.google.com/p/openjpeg/issues/detail?id=80 Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/jpeg2000dec.c') diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index fdacf57929..68dd4c0ecc 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1309,7 +1309,9 @@ static int jpeg2000_decode_packets(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile Jpeg2000POCEntry *e = &tile->poc.poc[i]; ret = jpeg2000_decode_packets_po_iteration(s, tile, e->RSpoc, e->CSpoc, - e->LYEpoc, e->REpoc, e->CEpoc, + FFMIN(e->LYEpoc, tile->codsty[0].nlayers), + e->REpoc, + FFMIN(e->CEpoc, s->ncomponents), e->Ppoc, &tp_index ); if (ret < 0) -- cgit v1.2.3