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

GUAC-688: Fix segfault on resize.

Browse Source
This commit is contained in:
Michael Jumper 2014-05-13 10:41:06 -07:00
parent 51093201f5
commit dbaca11d68
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/guac_surface.c
View File

@ -671,39 +671,37 @@ void guac_common_surface_resize(guac_common_surface* surface, int w, int h) {
guac_socket* socket = surface->socket; guac_socket* socket = surface->socket;
const guac_layer* layer = surface->layer; const guac_layer* layer = surface->layer;
/* Copy old surface data */ unsigned char* old_buffer;
unsigned char* old_buffer = surface->buffer; int old_stride;
int old_stride = surface->stride;
guac_common_rect old_rect; guac_common_rect old_rect;
int sx = 0;
int sy = 0;
/* Copy old surface data */
old_buffer = surface->buffer;
old_stride = surface->stride;
guac_common_rect_init(&old_rect, 0, 0, surface->width, surface->height); guac_common_rect_init(&old_rect, 0, 0, surface->width, surface->height);
/* Create new buffer */ /* Re-initialize at new size */
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
unsigned char* buffer = calloc(h, stride);
/* Assign new data */
surface->width = w; surface->width = w;
surface->height = h; surface->height = h;
surface->stride = stride; surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
surface->buffer = buffer; surface->buffer = calloc(h, surface->stride);
/* Reset clipping rect */
guac_common_surface_reset_clip(surface); guac_common_surface_reset_clip(surface);
/* Init with old data */ /* Copy relevant old data */
guac_common_rect_constrain(&old_rect, &surface->bounds_rect); guac_common_rect_constrain(&old_rect, &surface->bounds_rect);
__guac_common_surface_put(old_buffer, old_stride, 0, 0, surface, &old_rect, 1); __guac_common_surface_put(old_buffer, old_stride, &sx, &sy, surface, &old_rect, 1);
/* Free old data */ /* Free old data */
free(old_buffer); free(old_buffer);
/* Clip dirty rect */ /* Clip dirty rect */
if (surface->dirty) { if (surface->dirty) {
guac_common_rect_constrain(&surface->dirty_rect, &surface->bounds_rect); guac_common_rect_constrain(&surface->dirty_rect, &surface->bounds_rect);
if (surface->dirty_rect.width <= 0 || surface->dirty_rect.height <= 0) if (surface->dirty_rect.width <= 0 || surface->dirty_rect.height <= 0)
surface->dirty = 0; surface->dirty = 0;
} }
/* Update Guacamole layer */ /* Update Guacamole layer */