summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-17 08:27:10 -0400
committerNick Mathewson <nickm@torproject.org>2016-10-17 08:27:10 -0400
commitdf84536ac129da6ad5c96cc5cd3dce9c4a1f39b7 (patch)
tree3de853d2b549245c53f9b52f4120c270e83d489f /src
parent55c468c5211d5b74acb677767f14d91cd0304771 (diff)
downloadtor-df84536ac129da6ad5c96cc5cd3dce9c4a1f39b7.tar.gz
tor-df84536ac129da6ad5c96cc5cd3dce9c4a1f39b7.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
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;