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 . --- .../libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch | 15 +++++++++++++++ third_party/libopenjpeg20/README.pdfium | 1 + third_party/libopenjpeg20/j2k.c | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch 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 a8f83c36a2..a5bdaa2f8d 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -23,4 +23,5 @@ Local Modifications: 0011-j2k_update_image_data.patch: Prevent bad signed -> unsigned casting. 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. 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; -- cgit v1.2.3