summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Chang <ochang@chromium.org>2016-05-23 10:54:25 -0700
committerOliver Chang <ochang@chromium.org>2016-05-23 10:54:25 -0700
commit1481e5543488ac4c58fddae753cf6201463e3c0d (patch)
treeda78f06010eb7ede94fef3777b64c0cb3cd7fb60
parentcab52d99de8f1f1d1cac4db429e06e4cc3cea896 (diff)
downloadpdfium-chromium/2704.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 .
-rw-r--r--third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch15
-rw-r--r--third_party/libopenjpeg20/README.pdfium1
-rw-r--r--third_party/libopenjpeg20/j2k.c4
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 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;