diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c
index 9c212a1eb..a8fe79839 100644
--- a/src/lib/openjp2/t2.c
+++ b/src/lib/openjp2/t2.c
@@ -1230,6 +1230,11 @@ static OPJ_BOOL opj_t2_read_packet_header(opj_t2_t* p_t2,
                     ++i;
                 }
 
+                if ((OPJ_UINT32)l_band->numbps + 1 < i) {
+                    opj_bio_destroy(l_bio);
+                    return OPJ_FALSE;
+                }
+
                 l_cblk->Mb = (OPJ_UINT32)l_band->numbps;
                 l_cblk->numbps = (OPJ_UINT32)l_band->numbps + 1 - i;
                 l_cblk->numlenbits = 3;