From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Aug 2014 14:21:17 +0000 (-0400)
Subject: Add a missing goto to an unusable branch and make the branch LD_BUG.
X-Git-Tag: tor-0.2.6.1-alpha~189^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6a05c1c549dca6e76b900feaee97941c5fb723c;p=thirdparty%2Ftor.git

Add a missing goto to an unusable branch and make the branch LD_BUG.

(It's LD_BUG to reach this point because the hashed password values
were tested earlier from options_validate)

[Coverity CID 1232091]
---

diff --git a/src/or/control.c b/src/or/control.c
index a920ac835e..11a853041b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1160,9 +1160,10 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
     }
     if (bad) {
       if (!also_cookie) {
-        log_warn(LD_CONTROL,
+        log_warn(LD_BUG,
                  "Couldn't decode HashedControlPassword: invalid base16");
         errstr="Couldn't decode HashedControlPassword value in configuration.";
+        goto err;
       }
       bad_password = 1;
       SMARTLIST_FOREACH(sl, char *, cp, tor_free(cp));