0006-opj_j2k_update_image_dimensions-reject-images-whose-coordinates.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132
  1. From 024b8407392cb0b82b04b58ed256094ed5799e04 Mon Sep 17 00:00:00 2001
  2. From: Even Rouault <even.rouault@spatialys.com>
  3. Date: Sat, 11 Jan 2020 01:51:19 +0100
  4. Subject: [PATCH] opj_j2k_update_image_dimensions(): reject images whose
  5. coordinates are beyond INT_MAX (fixes #1228)
  6. [Retrieved from:
  7. https://github.com/uclouvain/openjpeg/commit/024b8407392cb0b82b04b58ed256094ed5799e04]
  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  9. ---
  10. src/lib/openjp2/j2k.c | 8 ++++++++
  11. 1 file changed, 8 insertions(+)
  12. diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c
  13. index 14f6ff41a..922550eb1 100644
  14. --- a/src/lib/openjp2/j2k.c
  15. +++ b/src/lib/openjp2/j2k.c
  16. @@ -9221,6 +9221,14 @@ static OPJ_BOOL opj_j2k_update_image_dimensions(opj_image_t* p_image,
  17. l_img_comp = p_image->comps;
  18. for (it_comp = 0; it_comp < p_image->numcomps; ++it_comp) {
  19. OPJ_INT32 l_h, l_w;
  20. + if (p_image->x0 > (OPJ_UINT32)INT_MAX ||
  21. + p_image->y0 > (OPJ_UINT32)INT_MAX ||
  22. + p_image->x1 > (OPJ_UINT32)INT_MAX ||
  23. + p_image->y1 > (OPJ_UINT32)INT_MAX) {
  24. + opj_event_msg(p_manager, EVT_ERROR,
  25. + "Image coordinates above INT_MAX are not supported\n");
  26. + return OPJ_FALSE;
  27. + }
  28. l_img_comp->x0 = (OPJ_UINT32)opj_int_ceildiv((OPJ_INT32)p_image->x0,
  29. (OPJ_INT32)l_img_comp->dx);