From bd3d482adeee4fbeb7a5b3acdd43b96629fdbe4e Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 12 Sep 2016 23:05:18 -0700 Subject: [PATCH] GUACAMOLE-184: Only send contents of surface if non-empty. --- src/common/surface.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/common/surface.c b/src/common/surface.c index 99e91c06..dbb3b58a 100644 --- a/src/common/surface.c +++ b/src/common/surface.c @@ -1718,15 +1718,20 @@ void guac_common_surface_dup(guac_common_surface* surface, guac_user* user, guac_protocol_send_size(socket, surface->layer, surface->width, surface->height); - /* Get entire surface */ - cairo_surface_t* rect = cairo_image_surface_create_for_data( - surface->buffer, CAIRO_FORMAT_RGB24, - surface->width, surface->height, surface->stride); + /* Send contents of layer, if non-empty */ + if (surface->width > 0 && surface->height > 0) { - /* Send PNG for rect */ - guac_user_stream_png(user, socket, GUAC_COMP_OVER, surface->layer, - 0, 0, rect); - cairo_surface_destroy(rect); + /* Get entire surface */ + cairo_surface_t* rect = cairo_image_surface_create_for_data( + surface->buffer, CAIRO_FORMAT_RGB24, + surface->width, surface->height, surface->stride); + + /* Send PNG for rect */ + guac_user_stream_png(user, socket, GUAC_COMP_OVER, surface->layer, + 0, 0, rect); + cairo_surface_destroy(rect); + + } complete: pthread_mutex_unlock(&surface->_lock);