mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code cleanup: don't allocate excessive memory in update_read_bitmap_update

Browse Source 
removed no more actually used count property of BITMAP_UPDATE struct,
fixed allocating twice as memory for its rectangles - as of refactoring
at e5767f07 BITMAP_UPDATE struct is reused no more
This commit is contained in:
dance 2022-01-26 20:10:58 +03:00 committed by akallabeth
parent cbc6b666ae
commit 122268aec1
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/freerdp/update.h
View File

@ -66,7 +66,6 @@ typedef struct _BITMAP_DATA BITMAP_DATA;
struct _BITMAP_UPDATE
{
UINT32 count;
UINT32 number;
BITMAP_DATA* rectangles;
BOOL skipCompression;

16
libfreerdp/core/update.c
View File

@ -215,20 +215,10 @@ BITMAP_UPDATE* update_read_bitmap_update(rdpUpdate* update, wStream* s)
Stream_Read_UINT16(s, bitmapUpdate->number); /* numberRectangles (2 bytes) */
WLog_Print(up->log, WLOG_TRACE, "BitmapUpdate: %" PRIu32 "", bitmapUpdate->number);
if (bitmapUpdate->number > bitmapUpdate->count)
{
UINT32 count = bitmapUpdate->number * 2;
BITMAP_DATA* newdata =
(BITMAP_DATA*)realloc(bitmapUpdate->rectangles, sizeof(BITMAP_DATA) * count);
bitmapUpdate->rectangles = (BITMAP_DATA*)calloc(bitmapUpdate->number, sizeof(BITMAP_DATA));
if (!newdata)
goto fail;
bitmapUpdate->rectangles = newdata;
ZeroMemory(&bitmapUpdate->rectangles[bitmapUpdate->count],
sizeof(BITMAP_DATA) * (count - bitmapUpdate->count));
bitmapUpdate->count = count;
}
if (!bitmapUpdate->rectangles)
goto fail;
/* rectangles */
for (i = 0; i < bitmapUpdate->number; i++)