libvncserver: fix HTTP shutdown without httpDir

CMakeLists.txt

@@ -701,6 +701,7 @@ if(WITH_LIBVNCSERVER)
   list(APPEND SIMPLETESTS
     cargstest
     copyrecttest
+    http_no_dir_shutdown
   )
 endif(WITH_LIBVNCSERVER)
 
@@ -758,6 +759,7 @@ endif(LIBVNCSERVER_WITH_WEBSOCKETS AND WITH_LIBVNCSERVER)
 
 if(WITH_LIBVNCSERVER)
   add_test(NAME cargs COMMAND test_cargstest)
+  add_test(NAME http_no_dir_shutdown COMMAND test_http_no_dir_shutdown)
 endif(WITH_LIBVNCSERVER)
 if(UNIX)
   if(WITH_LIBVNCSERVER)

src/libvncserver/httpd.c

@@ -97,6 +97,13 @@ rfbHttpInitSockets(rfbScreenInfoPtr rfbScreen)
     if (rfbScreen->httpInitDone)
 	return;
 
+    INIT_MUTEX(cl.outputMutex);
+    INIT_MUTEX(cl.refCountMutex);
+    INIT_MUTEX(cl.sendMutex);
+    cl.readFromSocket = rfbDefaultReadFromSocket;
+    cl.peekAtSocket = rfbDefaultPeekAtSocket;
+    cl.hasPendingOnSocket = rfbDefaultHasPendingOnSocket;
+    cl.writeToSocket = rfbDefaultWriteToSocket;
     rfbScreen->httpInitDone = TRUE;
 
     if (!rfbScreen->httpDir)
@@ -127,16 +134,14 @@ rfbHttpInitSockets(rfbScreenInfoPtr rfbScreen)
     rfbLog("Listening for HTTP connections on TCP6 port %d\n", rfbScreen->http6Port);
     rfbLog("  URL http://%s:%d\n",rfbScreen->thisHost,rfbScreen->http6Port);
 #endif
-    INIT_MUTEX(cl.outputMutex);
-    INIT_MUTEX(cl.refCountMutex);
-    INIT_MUTEX(cl.sendMutex);
-    cl.readFromSocket = rfbDefaultReadFromSocket;
-    cl.peekAtSocket = rfbDefaultPeekAtSocket;
-    cl.hasPendingOnSocket = rfbDefaultHasPendingOnSocket;
-    cl.writeToSocket = rfbDefaultWriteToSocket;
 }
 
 void rfbHttpShutdownSockets(rfbScreenInfoPtr rfbScreen) {
+    if (!rfbScreen->httpInitDone)
+       return;
+
+    rfbScreen->httpInitDone = FALSE;
+
     if(rfbScreen->httpSock>-1) {
 	FD_CLR(rfbScreen->httpSock,&rfbScreen->allFds);
 	rfbCloseSocket(rfbScreen->httpSock);

test/http_no_dir_shutdown.c

@@ -0,0 +1,31 @@
+#include <rfb/rfb.h>
+
+#include <stdlib.h>
+
+int main(int argc, char **argv)
+{
+    rfbScreenInfoPtr screen;
+    char *fb;
+
+    screen = rfbGetScreen(&argc, argv, 16, 16, 8, 3, 4);
+    if (!screen)
+	return 1;
+
+    fb = (char *)calloc(16 * 16 * 4, 1);
+    if (!fb) {
+	rfbScreenCleanup(screen);
+	return 1;
+    }
+
+    screen->frameBuffer = fb;
+    screen->port = 0;
+    screen->ipv6port = 0;
+    screen->httpDir = NULL;
+
+    rfbInitServer(screen);
+    rfbShutdownServer(screen, TRUE);
+    rfbScreenCleanup(screen);
+    free(fb);
+
+    return 0;
+}