aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-11 21:11:28 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-11 21:11:28 +0000
commit7e351a634175cb89fba6393c80ea096bf5063556 (patch)
tree6c1f495f9d5f154da50bbff3318eb67e69376f0f /src/or
parent02e26ebc4969353ec71688a3c9088d4de944bff0 (diff)
downloadtor-7e351a634175cb89fba6393c80ea096bf5063556.tar.gz
tor-7e351a634175cb89fba6393c80ea096bf5063556.zip
Note that a couple of line in control.c are supposed to be dead-code.
I'm hoping not to have to litter the rest of our codebase with Coverity ignores, but I think these are the only one we need right now. svn:r17602
Diffstat (limited to 'src/or')
-rw-r--r--src/or/control.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index e2c6129045..43386ed622 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -764,6 +764,8 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
msg = "553 Unable to set option";
break;
case SETOPT_OK:
+ /* coverity[dead_error_line]
+ * (It's okay if we can never get to this point.) */
msg = "551 Internal error";
tor_fragile_assert();
break;
@@ -1191,8 +1193,11 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
err:
tor_free(password);
- if (!errstr)
+ if (!errstr) {
+ /* coverity[dead_error_line]
+ * (It's okay if we can never get to this point.) */
errstr = "Unknown reason.";
+ }
connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n",
errstr);
connection_mark_for_close(TO_CONN(conn));