maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[WIP]: Check surface allocations

Browse Source
This commit is contained in:
Nick Couchman 2020-04-16 13:47:30 -04:00
parent e011cf38eb
commit 4135c6e3b0
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/surface.c
View File

@ -1219,10 +1219,14 @@ guac_common_surface* guac_common_surface_alloc(guac_client* client,
/* Create corresponding Cairo surface */ /* Create corresponding Cairo surface */
surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, w); surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, w);
surface->buffer = calloc(h, surface->stride); surface->buffer = calloc(h, surface->stride);
if (surface->buffer == NULL)
return NULL;
/* Create corresponding heat map */ /* Create corresponding heat map */
surface->heat_map = calloc(heat_width * heat_height, surface->heat_map = calloc(heat_width * heat_height,
sizeof(guac_common_surface_heat_cell)); sizeof(guac_common_surface_heat_cell));
if (surface->heat_map == NULL)
return NULL;
/* Reset clipping rect */ /* Reset clipping rect */
guac_common_surface_reset_clip(surface); guac_common_surface_reset_clip(surface);
@ -1286,6 +1290,8 @@ void guac_common_surface_resize(guac_common_surface* surface, int w, int h) {
surface->height = h; surface->height = h;
surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, w); surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, w);
surface->buffer = calloc(h, surface->stride); surface->buffer = calloc(h, surface->stride);
if (surface->buffer == NULL)
return NULL;
__guac_common_bound_rect(surface, &surface->clip_rect, NULL, NULL); __guac_common_bound_rect(surface, &surface->clip_rect, NULL, NULL);
/* Copy relevant old data */ /* Copy relevant old data */
@ -1299,6 +1305,8 @@ void guac_common_surface_resize(guac_common_surface* surface, int w, int h) {
free(surface->heat_map); free(surface->heat_map);
surface->heat_map = calloc(heat_width * heat_height, surface->heat_map = calloc(heat_width * heat_height,
sizeof(guac_common_surface_heat_cell)); sizeof(guac_common_surface_heat_cell));
if (surface->heat_map == NULL)
return NULL;
/* Resize dirty rect to fit new surface dimensions */ /* Resize dirty rect to fit new surface dimensions */
if (surface->dirty) { if (surface->dirty) {