[tor-commits] [tor/master] Initialize two variables

[nickm at torproject.org]

commit 348f2744cf0d026b1bd06a11d599f0ecf675038d
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat Mar 21 01:59:05 2015 +0100

    Initialize two variables
    
    This is a trivial change to get around two compiler warnings when
    assertions are removed during coverage builds.
---
 src/common/aes.c    |    2 +-
 src/or/connection.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/aes.c b/src/common/aes.c
index 7651f1d..95026dd 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -331,7 +331,7 @@ static void
 aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits)
 {
   if (should_use_EVP) {
-    const EVP_CIPHER *c;
+    const EVP_CIPHER *c = 0;
     switch (key_bits) {
       case 128: c = EVP_aes_128_ecb(); break;
       case 192: c = EVP_aes_192_ecb(); break;
diff --git a/src/or/connection.c b/src/or/connection.c
index dcf716f..369df67 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1407,7 +1407,7 @@ static int
 connection_handle_listener_read(connection_t *conn, int new_type)
 {
   tor_socket_t news; /* the new socket */
-  connection_t *newconn;
+  connection_t *newconn = 0;
   /* information about the remote peer when connecting to other routers */
   struct sockaddr_storage addrbuf;
   struct sockaddr *remote = (struct sockaddr*)&addrbuf;