diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-09-01 13:25:16 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-05 14:10:37 +0000 |
| commit | 088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c (patch) | |
| tree | 27f55db27d9112910d9219efa58474a0c2bd9b52 /third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch | |
| parent | 740bcd892d22136873b2b123b94e51bf6e77b8f9 (diff) | |
| download | pdfium-088ca03f25fe1f6d75c0ff3b71e0ad3d018a5e0c.tar.xz | |
Upgrade OpenJPEG to 2.2.0
This CL upgrades OpenJPEG by copying the files from 2.2.0 and then applying
patches. Patch files that are no longer relevant are deleted. The relevant
ones are applied manually due to changes in formatting in OpenJPEG. Patch 34
is added to account for opj_malloc changes in PDFium.
Bug: chromium:718731
Change-Id: I3d316893eab5e235c9f71222a6818b8ae0c98383
Reviewed-on: https://pdfium-review.googlesource.com/12770
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch')
| -rw-r--r-- | third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch b/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch index 56f0cf0e8e..760ed7462b 100644 --- a/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch +++ b/third_party/libopenjpeg20/0015-read_SPCod_SPCoc_overflow.patch @@ -1,15 +1,15 @@ diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c -index 9056feb..c7aa8db 100644 +index 8e35b33ee..d95963a5c 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; +@@ -9527,6 +9527,10 @@ 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; -+ } + /* precondition again */ ++ if (compno >= p_j2k->m_private_image->numcomps) { ++ return OPJ_FALSE; ++ } ++ + assert(compno < p_j2k->m_private_image->numcomps); - l_tccp = &l_tcp->tccps[compno]; - l_current_ptr = p_header_data; + l_tccp = &l_tcp->tccps[compno]; |