From 0fa150a12267b69abcfe5e380b698bbbbd37d5de Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 1 Aug 2018 17:44:48 +0000 Subject: Fix assertion in opj_j2k_merge_ppt(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patches in: https://github.com/uclouvain/openjpeg/commit/832dfd18 https://github.com/uclouvain/openjpeg/commit/0c913b0a Also clean up a duplicate patch number and update README.pdfium. BUG=chromium:614691 Change-Id: I282abfe227e2f667418e5d9058e96e253b220de7 Reviewed-on: https://pdfium-review.googlesource.com/39352 Reviewed-by: Nicolás Peña Moreno Commit-Queue: Lei Zhang --- third_party/libopenjpeg20/README.pdfium | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'third_party/libopenjpeg20/README.pdfium') diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium index 1805000634..2c944d5999 100644 --- a/third_party/libopenjpeg20/README.pdfium +++ b/third_party/libopenjpeg20/README.pdfium @@ -27,4 +27,6 @@ Local Modifications: 0026-use_opj_uint_ceildiv.patch: Remove (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)a, (OPJ_INT32) b). 0033-undefined-shift-opj_t1_dec_clnpass.patch: fix undefined shifts originated from opj_t1_decode_cblk. 0034-opj_malloc.patch: PDFium changes in opj_malloc. -0035-opj_j2k_update_image_dimensions.patch: fix integer overflow. +0035-opj_image_data_free.patch: Use the right free function in opj_jp2_apply_pclr. +0036-opj_j2k_update_image_dimensions.patch: fix integer overflow. +0037-opj_j2k_merge_ppt_leak.patch: fix memory leak. -- cgit v1.2.3