diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-05-23 10:54:25 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-05-23 10:54:25 -0700 |
| commit | 1481e5543488ac4c58fddae753cf6201463e3c0d (patch) | |
| tree | da78f06010eb7ede94fef3777b64c0cb3cd7fb60 /third_party/libopenjpeg20/j2k.c | |
| parent | cab52d99de8f1f1d1cac4db429e06e4cc3cea896 (diff) | |
| download | pdfium-1481e5543488ac4c58fddae753cf6201463e3c0d.tar.xz | |
Merge to M51: openjpeg: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc.chromium/2704
BUG=chromium:613160
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Original Review-Url: https://codereview.chromium.org/2001663002
Review URL: https://codereview.chromium.org/2006643003 .
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; |