diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-06-23 19:56:24 -0700 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-06-23 19:56:24 -0700 |
| commit | 4707a8f8ab98e3091e109cab71dea69a27c217db (patch) | |
| tree | 63ef929f490ef66f99768f650011d5ac66da01b5 | |
| parent | 065af557f21d4e42438d48b6b0e18ffcf33fa8a5 (diff) | |
| download | pdfium-4707a8f8ab98e3091e109cab71dea69a27c217db.tar.xz | |
Merge to M52: openjpeg: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc.
BUG=chromium:619405
TBR=thestig@chromium.org
Original Review-Url: https://codereview.chromium.org/2071773002
(cherry picked from commit 338a6b75994eb148d429b7abccfffaf7ae9f9b55)
Review URL: https://codereview.chromium.org/2098663003 .
| -rw-r--r-- | third_party/libopenjpeg20/0016-read_SQcd_SQcc_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/0016-read_SQcd_SQcc_overflow.patch b/third_party/libopenjpeg20/0016-read_SQcd_SQcc_overflow.patch new file mode 100644 index 0000000000..7b8bfca42f --- /dev/null +++ b/third_party/libopenjpeg20/0016-read_SQcd_SQcc_overflow.patch @@ -0,0 +1,15 @@ +diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c +index c7aa8db..b5f6fe9 100644 +--- a/third_party/libopenjpeg20/j2k.c ++++ b/third_party/libopenjpeg20/j2k.c +@@ -9010,7 +9010,9 @@ static OPJ_BOOL opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, + p_j2k->m_specific_param.m_decoder.m_default_tcp; + + /* precondition again*/ +- assert(p_comp_no < p_j2k->m_private_image->numcomps); ++ if (p_comp_no >= p_j2k->m_private_image->numcomps) { ++ return OPJ_FALSE; ++ } + + l_tccp = &l_tcp->tccps[p_comp_no]; + l_current_ptr = p_header_data; diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index a5bdaa2f8d..897cfa1ea2 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 0015-read_SPCod_SPCoc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SPCod_SPCoc. +0016-read_SQcd_SQcc_overflow.patch: Prevent a buffer overflow in opj_j2k_read_SQcd_SQcc. TODO(thestig): List all the other patches. diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c index c7aa8db222..b5f6fe90f5 100644 --- a/third_party/libopenjpeg20/j2k.c +++ b/third_party/libopenjpeg20/j2k.c @@ -9010,7 +9010,9 @@ static OPJ_BOOL opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, p_j2k->m_specific_param.m_decoder.m_default_tcp; /* precondition again*/ - assert(p_comp_no < p_j2k->m_private_image->numcomps); + if (p_comp_no >= p_j2k->m_private_image->numcomps) { + return OPJ_FALSE; + } l_tccp = &l_tcp->tccps[p_comp_no]; l_current_ptr = p_header_data; |