diff options
| author | ochang <ochang@chromium.org> | 2016-05-20 09:54:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-20 09:54:24 -0700 |
| commit | 3cbb6fbcc7077d94161ec95b7bc1421671317c65 (patch) | |
| tree | ed4082fde34f3f41ee31587552e202a129ff2c2f | |
| parent | 788ac38e25fc6c000b36ec1722764673e192dea3 (diff) | |
| download | pdfium-chromium/2746.tar.xz | |
openjpeg: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc.chromium/2747chromium/2746chromium/2745chromium/2744
BUG=chromium:613160
Review-Url: https://codereview.chromium.org/2001663002
| -rw-r--r-- | third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch | 15 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/README.pdfium | 1 | ||||
| -rw-r--r-- | third_party/libopenjpeg20/j2k.c | 4 |
3 files changed, 19 insertions, 1 deletions
diff --git a/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch b/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch new file mode 100644 index 0000000000..56f0cf0e8e --- /dev/null +++ b/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch @@ -0,0 +1,15 @@ +diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c +index 9056feb..c7aa8db 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; diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index 82a3754482..559f1c1d11 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -24,4 +24,5 @@ Local Modifications: 0012-mct_sse.patch: Don't use SSE intrinsics in 32-bit builds. 0013-attrib_fix.patch: Don't needlessly redefine __attribute__, https://github.com/uclouvain/openjpeg/issues/727 0014-opj_jp2_read_ihdr_leak.patch: Memory leak in opj_jp2_read_ihdr(). +0015-read_SPCod_SPCoc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc. TODO(thestig): List all the other patches. 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; |