diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-05-27 09:33:08 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-05-27 09:33:08 -0700 |
| commit | 55b0a0c10c122463a15db6364ffd640cbd718299 (patch) | |
| tree | 19efee9bbb2107c51d12360518aed12567c344a8 /third_party/libopenjpeg20/j2k.c | |
| parent | 8bdb290b9301200aeafa8b89678e690166ba1ce6 (diff) | |
| download | pdfium-55b0a0c10c122463a15db6364ffd640cbd718299.tar.xz | |
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 .
Diffstat (limited to 'third_party/libopenjpeg20/j2k.c')
| -rw-r--r-- | third_party/libopenjpeg20/j2k.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |