From 55b0a0c10c122463a15db6364ffd640cbd718299 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Fri, 27 May 2016 09:33:08 -0700 Subject: Merge to M52: openjpeg: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc. BUG=chromium:613160 TBR=tsepez@chromium.org Review-Url: https://codereview.chromium.org/2001663002 (cherry picked from commit 3cbb6fbcc7077d94161ec95b7bc1421671317c65) Review URL: https://codereview.chromium.org/2019033002 . --- third_party/libopenjpeg20/j2k.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'third_party/libopenjpeg20/j2k.c') diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c index 9056feb29a..c7aa8db222 100644 --- a/third_party/libopenjpeg20/j2k.c +++ b/third_party/libopenjpeg20/j2k.c @@ -8744,7 +8744,9 @@ static OPJ_BOOL opj_j2k_read_SPCod_SPCoc( opj_j2k_t *p_j2k, p_j2k->m_specific_param.m_decoder.m_default_tcp; /* precondition again */ - assert(compno < p_j2k->m_private_image->numcomps); + if (compno >= p_j2k->m_private_image->numcomps) { + return OPJ_FALSE; + } l_tccp = &l_tcp->tccps[compno]; l_current_ptr = p_header_data; -- cgit v1.2.3