From 291368db5f54f7e7ccd8bb1b6a4d37804458f08c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 20:39:32 +0000 Subject: Apply patch libtiff-CVE-2018-17100.patch patch_name: libtiff-CVE-2018-17100.patch present_in_specfile: true --- diff --git a/tools/ppm2tiff.c b/tools/ppm2tiff.c index 91415e9..81ffa3d 100644 --- a/tools/ppm2tiff.c +++ b/tools/ppm2tiff.c @@ -72,15 +72,16 @@ BadPPM(char* file) exit(-2); } + +#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0)) +#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1) + static tmsize_t multiply_ms(tmsize_t m1, tmsize_t m2) { - tmsize_t bytes = m1 * m2; - - if (m1 && bytes / m1 != m2) - bytes = 0; - - return bytes; + if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 ) + return 0; + return m1 * m2; } int