mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-27 22:03:31 +01:00
Massage a little code to hopfully please coverity.
svn:r17669
This commit is contained in:
parent
f3f6daf819
commit
d597b23c42
@ -764,8 +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.) */
|
||||
/* (It's okay if we can never get to this point.) */
|
||||
/* coverity[dead_error_line] */
|
||||
msg = "551 Internal error";
|
||||
tor_fragile_assert();
|
||||
break;
|
||||
@ -1194,8 +1194,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
|
||||
err:
|
||||
tor_free(password);
|
||||
if (!errstr) {
|
||||
/* coverity[dead_error_line]
|
||||
* (It's okay if we can never get to this point.) */
|
||||
/* (It's okay if we can never get to this point.) */
|
||||
/* coverity[dead_error_line] */
|
||||
errstr = "Unknown reason.";
|
||||
}
|
||||
connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n",
|
||||
|
@ -3588,15 +3588,16 @@ test_policy_summary_helper(const char *policy_str,
|
||||
const char *expected_summary)
|
||||
{
|
||||
config_line_t line;
|
||||
smartlist_t *policy = NULL;
|
||||
smartlist_t *policy = smartlist_create();
|
||||
char *summary = NULL;
|
||||
int r;
|
||||
|
||||
policy = NULL;
|
||||
line.key = (char*)"foo";
|
||||
line.value = (char *)policy_str;
|
||||
line.next = NULL;
|
||||
|
||||
test_assert(0 == policies_parse_exit_policy(&line, &policy, 0, NULL));
|
||||
r = policies_parse_exit_policy(&line, &policy, 0, NULL);
|
||||
test_eq(r, 0);
|
||||
summary = policy_summarize(policy);
|
||||
|
||||
test_assert(summary != NULL);
|
||||
@ -4184,6 +4185,8 @@ test_crypto_aes_iv(void)
|
||||
crypto_free_cipher_env(cipher);
|
||||
cipher = NULL;
|
||||
test_eq(encrypted_size, 16 + 1);
|
||||
tor_assert(encrypted_size > 0); /*XXXX021 Obviously this is true. But does
|
||||
* this make Coverity happy? */
|
||||
cipher = crypto_create_init_cipher(key1, 0);
|
||||
decrypted_size = crypto_cipher_decrypt_with_iv(cipher, decrypted1, 1,
|
||||
encrypted1, encrypted_size);
|
||||
|
Loading…
Reference in New Issue
Block a user