summaryrefslogtreecommitdiff
path: root/third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2018-08-01 17:44:48 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-08-01 17:44:48 +0000
commit0fa150a12267b69abcfe5e380b698bbbbd37d5de (patch)
tree0c6d5c396bb4fdf875271fe65c63ac7752ba5f49 /third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch
parentb9e6281b72cd2ae51fd2d320430fba9c1f63fd2f (diff)
downloadpdfium-0fa150a12267b69abcfe5e380b698bbbbd37d5de.tar.xz
Fix assertion in opj_j2k_merge_ppt().
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 <npm@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch')
-rw-r--r--third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch49
1 files changed, 49 insertions, 0 deletions
diff --git a/third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch b/third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch
new file mode 100644
index 0000000000..b918c0586e
--- /dev/null
+++ b/third_party/libopenjpeg20/0036-opj_j2k_update_image_dimensions.patch
@@ -0,0 +1,49 @@
+diff --git a/third_party/libopenjpeg20/j2k.c b/third_party/libopenjpeg20/j2k.c
+index 784a0620a..cea614709 100644
+--- a/third_party/libopenjpeg20/j2k.c
++++ b/third_party/libopenjpeg20/j2k.c
+@@ -9223,32 +9223,30 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
+
+ l_img_comp = p_image->comps;
+ for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
+- OPJ_INT32 l_h, l_w;
+-
+ l_img_comp->x0 = opj_uint_ceildiv(p_image->x0, l_img_comp->dx);
+ l_img_comp->y0 = opj_uint_ceildiv(p_image->y0, l_img_comp->dy);
+ l_comp_x1 = opj_int_ceildiv((OPJ_INT32)p_image->x1, (OPJ_INT32)l_img_comp->dx);
+ l_comp_y1 = opj_int_ceildiv((OPJ_INT32)p_image->y1, (OPJ_INT32)l_img_comp->dy);
+
+- l_w = opj_int_ceildivpow2(l_comp_x1, (OPJ_INT32)l_img_comp->factor)
+- - opj_int_ceildivpow2((OPJ_INT32)l_img_comp->x0, (OPJ_INT32)l_img_comp->factor);
+- if (l_w < 0) {
++ OPJ_INT32 l_1 = opj_int_ceildivpow2(l_comp_x1, (OPJ_INT32)l_img_comp->factor);
++ OPJ_INT32 l_2 = opj_int_ceildivpow2((OPJ_INT32)l_img_comp->x0, (OPJ_INT32)l_img_comp->factor);
++ if (l_1 < l_2) {
+ opj_event_msg(p_manager, EVT_ERROR,
+- "Size x of the decoded component image is incorrect (comp[%d].w=%d).\n",
+- it_comp, l_w);
++ "Size x of the decoded component image is incorrect (comp[%d].w<0).\n",
++ it_comp);
+ return OPJ_FALSE;
+ }
+- l_img_comp->w = (OPJ_UINT32)l_w;
++ l_img_comp->w = (OPJ_UINT32)(l_1-l_2);
+
+- l_h = opj_int_ceildivpow2(l_comp_y1, (OPJ_INT32)l_img_comp->factor)
+- - opj_int_ceildivpow2((OPJ_INT32)l_img_comp->y0, (OPJ_INT32)l_img_comp->factor);
+- if (l_h < 0) {
++ l_1 = opj_int_ceildivpow2(l_comp_y1, (OPJ_INT32)l_img_comp->factor);
++ l_2 = opj_int_ceildivpow2((OPJ_INT32)l_img_comp->y0, (OPJ_INT32)l_img_comp->factor);
++ if (l_1 < l_2) {
+ opj_event_msg(p_manager, EVT_ERROR,
+- "Size y of the decoded component image is incorrect (comp[%d].h=%d).\n",
+- it_comp, l_h);
++ "Size y of the decoded component image is incorrect (comp[%d].h<0).\n",
++ it_comp);
+ return OPJ_FALSE;
+ }
+- l_img_comp->h = (OPJ_UINT32)l_h;
++ l_img_comp->h = (OPJ_UINT32)(l_1-l_2);
+
+ l_img_comp++;
+ }