1*4882a593SmuzhiyunFrom 11c8026913e190b02266c1247e7a770e488d925e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Even Rouault <even.rouault@spatialys.com> 3*4882a593SmuzhiyunDate: Tue, 8 Nov 2022 15:16:58 +0100 4*4882a593SmuzhiyunSubject: [PATCH] TIFFReadRGBATileExt(): fix (unsigned) integer overflow on 5*4882a593Smuzhiyun strips/tiles > 2 GB 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunFixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=53137 8*4882a593SmuzhiyunUpstream-Status: Accepted 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun libtiff/tif_getimage.c | 8 ++++---- 13*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 4 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/libtiff/tif_getimage.c b/libtiff/tif_getimage.c 16*4882a593Smuzhiyunindex a1b6570b..9a2e0c59 100644 17*4882a593Smuzhiyun--- a/libtiff/tif_getimage.c 18*4882a593Smuzhiyun+++ b/libtiff/tif_getimage.c 19*4882a593Smuzhiyun@@ -3058,15 +3058,15 @@ TIFFReadRGBATileExt(TIFF* tif, uint32_t col, uint32_t row, uint32_t * raster, in 20*4882a593Smuzhiyun return( ok ); 21*4882a593Smuzhiyun 22*4882a593Smuzhiyun for( i_row = 0; i_row < read_ysize; i_row++ ) { 23*4882a593Smuzhiyun- memmove( raster + (tile_ysize - i_row - 1) * tile_xsize, 24*4882a593Smuzhiyun- raster + (read_ysize - i_row - 1) * read_xsize, 25*4882a593Smuzhiyun+ memmove( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, 26*4882a593Smuzhiyun+ raster + (size_t)(read_ysize - i_row - 1) * read_xsize, 27*4882a593Smuzhiyun read_xsize * sizeof(uint32_t) ); 28*4882a593Smuzhiyun- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize+read_xsize, 29*4882a593Smuzhiyun+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize+read_xsize, 30*4882a593Smuzhiyun 0, sizeof(uint32_t) * (tile_xsize - read_xsize) ); 31*4882a593Smuzhiyun } 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun for( i_row = read_ysize; i_row < tile_ysize; i_row++ ) { 34*4882a593Smuzhiyun- _TIFFmemset( raster + (tile_ysize - i_row - 1) * tile_xsize, 35*4882a593Smuzhiyun+ _TIFFmemset( raster + (size_t)(tile_ysize - i_row - 1) * tile_xsize, 36*4882a593Smuzhiyun 0, sizeof(uint32_t) * tile_xsize ); 37*4882a593Smuzhiyun } 38*4882a593Smuzhiyun 39