From 4ea9c3f77b298b4da5e95062023cafbc7c19a021 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <PromyLOPh@lavabit.com>
Date: Mon, 18 Oct 2010 19:56:17 +0200
Subject: Initialize main fd array

Cherry-picked from Josh Elsasser's unixsocket patch.
---
 src/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index 19cdad2..40bd64a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -60,7 +60,7 @@ int main (int argc, char **argv) {
 	char ctlPath[1024];
 	FILE *ctlFd = NULL;
 	struct timeval selectTimeout;
-	int maxFd, selectFds[2];
+	int maxFd, selectFds[2] = {-1, -1};
 	fd_set readSet, readSetCopy;
 	char buf = '\0';
 	/* terminal attributes _before_ we started messing around with ~ECHO */
@@ -313,7 +313,7 @@ int main (int argc, char **argv) {
 
 			if (FD_ISSET(selectFds[0], &readSetCopy)) {
 				curFd = stdin;
-			} else if (FD_ISSET(selectFds[1], &readSetCopy)) {
+			} else if (selectFds[1] != -1 && FD_ISSET(selectFds[1], &readSetCopy)) {
 				curFd = ctlFd;
 			}
 			buf = fgetc (curFd);
-- 
cgit v1.2.3