From 6b51d11d085753c64fb7c2908068730bcf95d5cf Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Wed, 12 Mar 2014 10:10:21 +0000 Subject: [PATCH] [trunk] Make sure when reading POC that number of layers (layer end) is within acceptable bound. Fixes issue 80 --- src/lib/openjp2/j2k.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index 466e61b2..ce5ef77f 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -3175,6 +3175,8 @@ static OPJ_BOOL opj_j2k_read_poc ( opj_j2k_t *p_j2k, opj_read_bytes(p_header_data,&(l_current_poc->compno0),l_comp_room); /* CSpoc_i */ p_header_data+=l_comp_room; opj_read_bytes(p_header_data,&(l_current_poc->layno1),2); /* LYEpoc_i */ + /* make sure layer end is in acceptable bounds */ + l_current_poc->layno1 = opj_uint_min(l_current_poc->layno1, l_tcp->numlayers); p_header_data+=2; opj_read_bytes(p_header_data,&(l_current_poc->resno1),1); /* REpoc_i */ ++p_header_data;