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

Clear memory allocated to resized bitmaps

Browse Source 
This prevents valgrind errors when resizing the screen to
a larger size on GFX systems.
This commit is contained in:
matt335672 2024-02-17 17:36:01 +00:00 committed by Koichiro Iwao
parent 355a71fe6d
commit ab698c3d58
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xrdp/xrdp_bitmap_common.c
View File

@ -301,8 +301,6 @@ xrdp_bitmap_resize(struct xrdp_bitmap *self, int width, int height)
return 1;
}
self->width = width;
self->height = height;
Bpp = 4;
switch (self->bpp)
@ -318,8 +316,28 @@ xrdp_bitmap_resize(struct xrdp_bitmap *self, int width, int height)
break;
}
g_free(self->data);
self->data = (char *)g_malloc(width * height * Bpp, 0);
/* To prevent valgrind errors (particularly on a screen resize),
clear extra memory */
unsigned long old_size = self->width * self->height * Bpp;
unsigned long new_size = width * height * Bpp;
char *new_data = (char *)realloc(self->data, new_size);
if (new_data == NULL)
{
return 1;
}
self->width = width;
self->height = height;
if (new_data != self->data)
{
self->data = new_data;
memset(self->data, 0, new_size);
}
else if (new_size > old_size)
{
memset(self->data + old_size, 0, new_size - old_size);
}
self->line_size = width * Bpp;
return 0;
}