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

Fixed lack of initialization of now-used pointers.

Browse Source
This commit is contained in:
Michael Jumper 2011-03-14 10:59:47 -07:00
parent 82fcbe98e5
commit bbc373c1b9
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
protocols/vnc/src/vnc_client.c
View File

@ -219,8 +219,10 @@ rfbBool guac_vnc_malloc_framebuffer(rfbClient* rfb_client) {
vnc_guac_client_data* guac_client_data = (vnc_guac_client_data*) gc->data; vnc_guac_client_data* guac_client_data = (vnc_guac_client_data*) gc->data;
/* Free old buffers */ /* Free old buffers */
guac_free_png_buffer(guac_client_data->png_buffer, guac_client_data->buffer_height); if (guac_client_data->png_buffer != NULL)
guac_free_png_buffer(guac_client_data->png_buffer_alpha, guac_client_data->buffer_height); guac_free_png_buffer(guac_client_data->png_buffer, guac_client_data->buffer_height);
if (guac_client_data->png_buffer_alpha != NULL)
guac_free_png_buffer(guac_client_data->png_buffer_alpha, guac_client_data->buffer_height);
/* Allocate new buffers */ /* Allocate new buffers */
guac_client_data->png_buffer = guac_alloc_png_buffer(rfb_client->width, rfb_client->height, 3); /* No-alpha */ guac_client_data->png_buffer = guac_alloc_png_buffer(rfb_client->width, rfb_client->height, 3); /* No-alpha */
@ -351,13 +353,15 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
read_only = 1; read_only = 1;
/* Freed after use by libvncclient */ /* Freed after use by libvncclient */
guac_client_data->password = malloc(64); guac_client_data->password = strdup(argv[4]);
strncpy(guac_client_data->password, argv[3], 63);
/*** INIT RFB CLIENT ***/ /*** INIT RFB CLIENT ***/
rfb_client = rfbGetClient(8, 3, 4); /* 32-bpp client */ rfb_client = rfbGetClient(8, 3, 4); /* 32-bpp client */
/* Store Guac client in rfb client */
rfbClientSetClientData(rfb_client, __GUAC_CLIENT, client);
/* Framebuffer update handler */ /* Framebuffer update handler */
rfb_client->GotFrameBufferUpdate = guac_vnc_update; rfb_client->GotFrameBufferUpdate = guac_vnc_update;
rfb_client->GotCopyRect = guac_vnc_copyrect; rfb_client->GotCopyRect = guac_vnc_copyrect;
@ -376,13 +380,12 @@ int guac_client_init(guac_client* client, int argc, char** argv) {
rfb_client->GetPassword = guac_vnc_get_password; rfb_client->GetPassword = guac_vnc_get_password;
/* Hook into allocation so we can handle resize. */ /* Hook into allocation so we can handle resize. */
guac_client_data->png_buffer = NULL;
guac_client_data->png_buffer_alpha = NULL;
guac_client_data->rfb_MallocFrameBuffer = rfb_client->MallocFrameBuffer; guac_client_data->rfb_MallocFrameBuffer = rfb_client->MallocFrameBuffer;
rfb_client->MallocFrameBuffer = guac_vnc_malloc_framebuffer; rfb_client->MallocFrameBuffer = guac_vnc_malloc_framebuffer;
rfb_client->canHandleNewFBSize = 1; rfb_client->canHandleNewFBSize = 1;
/* Store Guac client in rfb client */
rfbClientSetClientData(rfb_client, __GUAC_CLIENT, client);
/* Set hostname and port */ /* Set hostname and port */
rfb_client->serverHost = strdup(argv[0]); rfb_client->serverHost = strdup(argv[0]);
rfb_client->serverPort = atoi(argv[1]); rfb_client->serverPort = atoi(argv[1]);