From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 22 Jan 2010 21:32:15 +0000 (-0500)
Subject: Avoid a possible crash in tls_log_errors.
X-Git-Tag: tor-0.2.2.8-alpha~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ad5094c9093f342a1f96fac7d90eb1781321e9a;p=thirdparty%2Ftor.git

Avoid a possible crash in tls_log_errors.

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.
---

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 5b323267c1..beab5356c5 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:"",