[tor-commits] [tor/master] Coverity: fix test issues with always-present 'service' var.

[asn at torproject.org]

commit 5fa2b322005d1860d39e420cb6d3ed25f5073389
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 28 12:24:26 2019 -0400

    Coverity: fix test issues with always-present 'service' var.
    
    Coverity is worried that we check "service" at the end of these test
    functions, since it doesn't see any way to reach the cleanup code
    without having first dereferenced the variable.
    
    Removing the check would be unwise in this case: instead we add a
    tt_assert check before using "service" so that coverity thinks that
    the check is doing something useful.
    
    Bugfix on 0.3.2.1-alpha.
---
 src/test/test_hs_common.c  | 1 +
 src/test/test_hs_service.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index abded6021..de3f7e04f 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -502,6 +502,7 @@ test_desc_reupload_logic(void *arg)
                 pubkey_hex, strlen(pubkey_hex));
   hs_build_address(&pubkey, HS_VERSION_THREE, onion_addr);
   service = tor_malloc_zero(sizeof(hs_service_t));
+  tt_assert(service);
   memcpy(service->onion_address, onion_addr, sizeof(service->onion_address));
   ed25519_secret_key_generate(&service->keys.identity_sk, 0);
   ed25519_public_key_generate(&service->keys.identity_pk,
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index a303f1041..2e4be4e29 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -1265,6 +1265,7 @@ test_service_event(void *arg)
 
   /* Set a service for this circuit. */
   service = helper_create_service();
+  tt_assert(service);
   ed25519_pubkey_copy(&circ->hs_ident->identity_pk,
                       &service->keys.identity_pk);