[tor-commits] [tor/master] Add a missing goto to an unusable branch and make the branch LD_BUG.

[nickm@xxxxxxxxxxxxxx]

commit e6a05c1c549dca6e76b900feaee97941c5fb723c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Aug 21 10:21:17 2014 -0400

    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]
---
 src/or/control.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/control.c b/src/or/control.c
index a920ac8..11a8530 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));



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits