From: teor <teor2345@gmail.com>
Date: Wed, 10 Jun 2015 15:06:15 +0000 (+1000)
Subject: Fix clang address of struct member always non-NULL in SSL master key
X-Git-Tag: tor-0.2.7.2-alpha~95^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e870f6285d8c490536f62c6923ad0aca9844079d;p=thirdparty%2Ftor.git

Fix clang address of struct member always non-NULL in SSL master key

clang complains that the address of struct member in an assert in
SSL_SESSION_get_master_key is always non-NULL.
Instead, check each pointer argument is non-NULL before using it.

Fix on f90a704f1258 from 27 May 2015, not in any released version of tor.
---

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 4cfe94e182..98840c15cf 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -2631,10 +2631,11 @@ SSL_get_server_random(SSL *s, uint8_t *out, size_t len)
 static size_t
 SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, size_t len)
 {
+  tor_assert(s);
   if (len == 0)
     return s->master_key_length;
   tor_assert(len == (size_t)s->master_key_length);
-  tor_assert(s->master_key);
+  tor_assert(out);
   memcpy(out, s->master_key, len);
   return len;
 }