Attachment 160117 Details for Bug 240012 – Avoid double cleanup

[patch] Avoid double cleanup

vnc-double-cleanup.patch (text/plain), 1.02 KB, created by Markus Armbruster on 2007-07-27 14:15:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Armbruster

Created: 2007-07-27 14:15:17 UTC

Size: 1.02 KB

patch

obsolete

>The client iterator (protected by rfbClientListMutex) skips entries
>with sock<0.  But rfbClientConnectionGone() neglects to reset
>cl->sock.  This leads to double-cleanup, with disastrous results.
>
>diff -rup a/LibVNCServer-0.8.2/libvncserver/rfbserver.c b/LibVNCServer-0.8.2/libvncserver/rfbserver.c
>--- a/LibVNCServer-0.8.2/libvncserver/rfbserver.c	2007-07-27 15:14:52.000000000 +0200
>+++ b/LibVNCServer-0.8.2/libvncserver/rfbserver.c	2007-07-27 15:40:57.000000000 +0200
>@@ -474,8 +474,11 @@ rfbClientConnectionGone(rfbClientPtr cl)
>     if (cl->next)
>         cl->next->prev = cl->prev;
> 
>-    if(cl->sock>0)
>+    if(cl->sock>=0) {
>+	FD_CLR(cl->sock,&(cl->screen->allFds));
> 	close(cl->sock);
>+	cl->sock = -1;
>+    }
> 
>     if (cl->scaledScreen!=NULL)
>         cl->scaledScreen->scaledScreenRefCount--;
>@@ -501,9 +504,6 @@ rfbClientConnectionGone(rfbClientPtr cl)
> 
>     UNLOCK(rfbClientListMutex);
> 
>-    if(cl->sock>=0)
>-       FD_CLR(cl->sock,&(cl->screen->allFds));
>-
>     cl->clientGoneHook(cl);
> 
>     rfbLog("Client %s gone\n",cl->host);

Actions: View | Diff

Attachments on bug 240012: 154832 | 154833 | 154848 | 154849 | 154900 | 154903 | 154904 | 154905 | 156605 | 156608 | 160117 | 160331 | 160332