[or-cvs] [tor/master 1/2] Avoid a possible crash in tls_log_errors.

[nickm@xxxxxxxxxxxxxx]

Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Fri, 22 Jan 2010 16:32:15 -0500
Subject: Avoid a possible crash in tls_log_errors.
Commit: 4ad5094c9093f342a1f96fac7d90eb1781321e9a

We were checking for msg==NULL, but not lib or proc.  This case can
only occur if we have an error whose string we somehow haven't loaded,
but it's worth coding defensively here.

Spotted by rieo on IRC.
---
 src/common/tortls.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 5b32326..beab535 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -180,6 +180,8 @@ tls_log_errors(tor_tls_t *tls, int severity, const char *doing)
     lib = (const char*)ERR_lib_error_string(err);
     func = (const char*)ERR_func_error_string(err);
     if (!msg) msg = "(null)";
+    if (!lib) lib = "(null)";
+    if (!func) func = "(null)";
     if (doing) {
       log(severity, LD_NET, "TLS error while %s%s%s: %s (in %s:%s)",
           doing, addr?" with ":"", addr?addr:"",
-- 
1.6.5