From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 17 Oct 2016 12:27:10 +0000 (-0400)
Subject: Add a logic-consistency test when parsing unix socket configs
X-Git-Tag: tor-0.2.9.4-alpha~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df84536ac129da6ad5c96cc5cd3dce9c4a1f39b7;p=thirdparty%2Ftor.git

Add a logic-consistency test when parsing unix socket configs

Coverity couldn't tell that 'addrport' was always non-NULL at this
point in the function, so I'm adding an explicit check. This closes
CID 1374060.
---

diff --git a/src/or/config.c b/src/or/config.c
index e3aa6d9d69..08c576e3d4 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6592,6 +6592,8 @@ parse_port_config(smartlist_t *out,
     if (unix_socket_path) {
       port = 1;
     } else if (is_unix_socket) {
+      if (BUG(!addrport))
+        goto err; // LCOV_EXCL_LINE unreachable, but coverity can't tell that
       unix_socket_path = tor_strdup(addrport);
       if (!strcmp(addrport, "0"))
         port = 0;