From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Dec 2008 21:11:28 +0000 (+0000)
Subject: Note that a couple of line in control.c are supposed to be dead-code.
X-Git-Tag: tor-0.2.1.9-alpha~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e351a634175cb89fba6393c80ea096bf5063556;p=thirdparty%2Ftor.git

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

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));