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

GUACAMOLE-1263: Mark freed memory as freed prior to calling rfbClientCleanup().

Browse Source 
Older versions of libvncclient did not free all memory within
rfbClientCleanup(), but this has been corrected as of their 0.9.12
release. As guacamole-server may well be built against older versions of
libvncclient, we can't simply remove the manual free() calls, but we
should be sure to set any memory that we free ourselves to NULL so that
rfbClientCleanup() does not attempt to free it again.
This commit is contained in:
Michael Jumper 2021-01-15 11:45:54 -08:00
parent 53f981f864
commit 612c5eba20
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/protocols/vnc/client.c
View File

@ -77,12 +77,27 @@ int guac_vnc_client_free_handler(guac_client* client) {
/* Wait for client thread to finish */ /* Wait for client thread to finish */
pthread_join(vnc_client->client_thread, NULL); pthread_join(vnc_client->client_thread, NULL);
/* Free memory not free'd by libvncclient's rfbClientCleanup() */ /* Free memory that may not be free'd by libvncclient's
if (rfb_client->frameBuffer != NULL) free(rfb_client->frameBuffer); * rfbClientCleanup() prior to libvncclient 0.9.12 */
if (rfb_client->raw_buffer != NULL) free(rfb_client->raw_buffer);
if (rfb_client->rcSource != NULL) free(rfb_client->rcSource); if (rfb_client->frameBuffer != NULL) {
free(rfb_client->frameBuffer);
rfb_client->frameBuffer = NULL;
}
if (rfb_client->raw_buffer != NULL) {
free(rfb_client->raw_buffer);
rfb_client->raw_buffer = NULL;
}
if (rfb_client->rcSource != NULL) {
free(rfb_client->rcSource);
rfb_client->rcSource = NULL;
}
/* Free VNC rfbClientData linked list (may not be free'd by
* rfbClientCleanup(), depending on libvncclient version) */
/* Free VNC rfbClientData linked list (not free'd by rfbClientCleanup()) */
while (rfb_client->clientData != NULL) { while (rfb_client->clientData != NULL) {
rfbClientData* next = rfb_client->clientData->next; rfbClientData* next = rfb_client->clientData->next;
free(rfb_client->clientData); free(rfb_client->clientData);