commit c9cac69ac68d8cdc66d3592f0812988336a1cf8d
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Aug 21 10:27:43 2014 -0400
Remove a dead check for errmsg in handle_control_authenticate
Coverity doesn't like doing NULL checks on things that can't be
NULL; I like checking things where the logic for their not being
NULL is nontrivial. Let's compromise, and make it obvious that this
field can't be NULL.
[Coverity CID 202004]
---
src/or/control.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/or/control.c b/src/or/control.c
index 11a8530..b3a9dd6 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1039,7 +1039,7 @@ handle_control_authenticate(control_connection_t *conn,
uint32_t len,
{
int used_quoted_string = 0;
const or_options_t *options = get_options();
- const char *errstr = NULL;
+ const char *errstr = "Unknown error";
char *password;
size_t password_len;
const char *cp;
@@ -1199,8 +1199,7 @@ handle_control_authenticate(control_connection_t *conn,
uint32_t len,
err:
tor_free(password);
- connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n",
- errstr ? errstr : "Unknown reason.");
+ connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n", errstr);
connection_mark_for_close(TO_CONN(conn));
return 0;
ok:
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
