From 9314b5492b501dbe6edb5430ee8d7c29ff772f68 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Sat, 20 Apr 2024 17:40:33 +0200 Subject: [PATCH] [codec,clear] use size_t types for sizes --- libfreerdp/codec/clear.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libfreerdp/codec/clear.c b/libfreerdp/codec/clear.c index 308052be6..c9538c83e 100644 --- a/libfreerdp/codec/clear.c +++ b/libfreerdp/codec/clear.c @@ -500,12 +500,12 @@ static BOOL clear_decompress_subcodecs_data(CLEAR_CONTEXT* clear, wStream* s, { case 0: /* Uncompressed */ { - UINT32 nSrcStep = width * FreeRDPGetBytesPerPixel(PIXEL_FORMAT_BGR24); - UINT32 nSrcSize = nSrcStep * height; + const UINT32 nSrcStep = width * FreeRDPGetBytesPerPixel(PIXEL_FORMAT_BGR24); + const size_t nSrcSize = 1ull * nSrcStep * height; if (bitmapDataByteCount != nSrcSize) { - WLog_ERR(TAG, "bitmapDataByteCount %" PRIu32 " != nSrcSize %" PRIu32 "", + WLog_ERR(TAG, "bitmapDataByteCount %" PRIu32 " != nSrcSize %" PRIuz "", bitmapDataByteCount, nSrcSize); return FALSE; } @@ -799,7 +799,8 @@ static BOOL clear_decompress_bands_data(CLEAR_CONTEXT* clear, wStream* s, UINT32 if (count > 0) { - const size_t offset = (y - vBarYOn) * FreeRDPGetBytesPerPixel(clear->format); + const size_t offset = + (1ull * y - vBarYOn) * FreeRDPGetBytesPerPixel(clear->format); pSrcPixel = &vBarShortEntry->pixels[offset]; if (offset + count > vBarShortEntry->count) {