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

GUAC-687: Initialize newly-allocated buffer space to transparent black.

Browse Source
This commit is contained in:
Michael Jumper 2014-05-12 13:50:51 -07:00
parent 9746ea68a4
commit 3e0828d6da
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/guac_surface.c
View File

@ -636,14 +636,11 @@ guac_common_surface* guac_common_surface_alloc(guac_socket* socket, const guac_l
/* Create corresponding Cairo surface */ /* Create corresponding Cairo surface */
surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w); surface->stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
surface->buffer = malloc(surface->stride * h); surface->buffer = calloc(h, surface->stride);
/* Reset clipping rect */ /* Reset clipping rect */
guac_common_surface_reset_clip(surface); guac_common_surface_reset_clip(surface);
/* Init with transparent black */
memset(surface->buffer, surface->stride * h, 0);
/* Layers must initially exist */ /* Layers must initially exist */
if (layer->index >= 0) { if (layer->index >= 0) {
guac_protocol_send_size(socket, layer, w, h); guac_protocol_send_size(socket, layer, w, h);
@ -681,7 +678,7 @@ void guac_common_surface_resize(guac_common_surface* surface, int w, int h) {
/* Create new buffer */ /* Create new buffer */
int stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w); int stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w);
unsigned char* buffer = malloc(stride * h); unsigned char* buffer = calloc(h, stride);
/* Assign new data */ /* Assign new data */
surface->width = w; surface->width = w;