|
 |
e0f39d |
From 66282f58000c8863e104666c30cb67b1d5cbdee3 Mon Sep 17 00:00:00 2001
|
|
|
e0f39d |
From: "Kyle J. McKay" <mackyle@gmail.com>
|
|
|
e0f39d |
Date: Fri, 18 May 2012 00:30:11 -0700
|
|
|
e0f39d |
Subject: [PATCH] libvncserver/sockets.c: do not segfault when
|
|
|
e0f39d |
listenSock/listen6Sock == -1
|
|
|
e0f39d |
MIME-Version: 1.0
|
|
|
e0f39d |
Content-Type: text/plain; charset=UTF-8
|
|
|
e0f39d |
Content-Transfer-Encoding: 8bit
|
|
|
e0f39d |
|
|
|
e0f39d |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
e0f39d |
---
|
|
|
e0f39d |
libvncserver/sockets.c | 4 ++--
|
|
|
e0f39d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
e0f39d |
|
|
|
e0f39d |
diff --git a/libvncserver/sockets.c b/libvncserver/sockets.c
|
|
|
e0f39d |
index 84c9c98..3ff2aac 100644
|
|
|
e0f39d |
--- a/libvncserver/sockets.c
|
|
|
e0f39d |
+++ b/libvncserver/sockets.c
|
|
|
e0f39d |
@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr rfbScreen)
|
|
|
e0f39d |
rfbLogPerror("rfbProcessNewConnection: error in select");
|
|
|
e0f39d |
return FALSE;
|
|
|
e0f39d |
}
|
|
|
e0f39d |
- if (FD_ISSET(rfbScreen->listenSock, &listen_fds))
|
|
|
e0f39d |
+ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
|
|
|
e0f39d |
chosen_listen_sock = rfbScreen->listenSock;
|
|
|
e0f39d |
- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
|
|
|
e0f39d |
+ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
|
|
|
e0f39d |
chosen_listen_sock = rfbScreen->listen6Sock;
|
|
|
e0f39d |
|
|
|
e0f39d |
if ((sock = accept(chosen_listen_sock,
|
|
|
e0f39d |
--
|
|
|
e0f39d |
2.13.5
|
|
|
e0f39d |
|