From ee35df3a419e18c494b020b14bb70075655c674b Mon Sep 17 00:00:00 2001
From: Tim Cava <tcava@users.sourceforge.net>
Date: Tue, 9 Jul 2013 07:06:43 +0000
Subject: [PATCH] Don't seed arcfour with uninitialized stack values when
 urandom can't be opened, but fail instead. Fixes using uninitialized value
 warnings from Coverity.

git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@263 13b04d17-f746-0410-82c6-800466cd88b0
---
 dll/arcfour/arcfour.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dll/arcfour/arcfour.c b/dll/arcfour/arcfour.c
index f341483..84ca146 100644
--- a/dll/arcfour/arcfour.c
+++ b/dll/arcfour/arcfour.c
@@ -70,11 +70,7 @@ static char *init_box(char *ukey, arckey *key)
 		close(fd);
 	}
 	else
-	{
-		buf[(int)buf[69]] ^= getpid();
-		buf[(int)buf[226]] ^= getuid();
-		buf[(int)buf[119]] ^= getpid();
-	}
+		return NULL;
 
 	MD5Init(&md5context);
 	MD5Update(&md5context, buf, sizeof(buf));
@@ -196,7 +192,11 @@ static int start_dcc_crypt (int s, int type, unsigned long d_addr, int d_port)
 		memset(randkey, 0, sizeof(randkey));
 		memset(buf, 0, sizeof(buf));
 		tmpbox->outbox = (arckey *)new_malloc(sizeof(arckey));
-		init_box(randkey, tmpbox->outbox);
+		if (init_box(randkey, tmpbox->outbox) == NULL)
+		{
+			new_free(&tmpbox->outbox);
+			return -1;
+		}
 		snprintf(buf, BIG_BUFFER_SIZE, "SecureDCC %s\r\n%n", randkey, &len);
 		write(s, buf, len);
 		memset(buf, 0, sizeof(buf));