You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.1 KiB
30 lines
1.1 KiB
From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
|
|
From: "Kyle J. McKay" <mackyle@gmail.com>
|
|
Date: Fri, 18 May 2012 00:30:11 -0700
|
|
Subject: [PATCH 05/32] libvncserver/sockets.c: do not segfault when
|
|
listenSock/listen6Sock == -1
|
|
|
|
---
|
|
libvncserver/sockets.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
|
|
index 84c9c98..3ff2aac 100644
|
|
--- a/libvncserver/sockets.c
|
|
+++ b/libvncserver/sockets.c
|
|
@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
|
|
rfbLogPerror("rfbProcessNewConnection: error in select");
|
|
return FALSE;
|
|
}
|
|
- if (FD_ISSET(rfbScreen->listenSock, &listen_fds))
|
|
+ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
|
|
chosen_listen_sock = rfbScreen->listenSock;
|
|
- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
|
|
+ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
|
|
chosen_listen_sock = rfbScreen->listen6Sock;
|
|
|
|
if ((sock = accept(chosen_listen_sock,
|
|
--
|
|
1.8.3.1
|
|
|