Add some missing null checks to unit tests; found by coverity

diff --git a/test/regress_main.c b/test/regress_main.c
index bbac2b41eb30a7e94796edcf17bcd907dffbc291..e32afff710a4e1cf0fe4ce70b8fbb50fe9b20491 100644 (file)
--- a/test/regress_main.c
+++ b/test/regress_main.c
@@ -305,7 +305,7 @@ static void *
 legacy_test_setup(const struct testcase_t *testcase)
 {
        struct basic_test_data *data = basic_test_setup(testcase);
-       if (data == (void*)TT_SKIP)
+       if (data == (void*)TT_SKIP || data == NULL)
                return data;
        global_base = data->base;
        pair[0] = data->pair[0];

diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index e03adcdf1230c972e16bb1f44159f380217915eb..7604ca44da332b6e94a07a00f3db723b8db97045 100644 (file)
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -113,6 +113,7 @@ MessageCb(EVRPC_STRUCT(Message)* rpc, void *arg)
                struct evhttp_request* req = EVRPC_REQUEST_HTTP(rpc);
                const char *header = evhttp_find_header(
                        req->input_headers, "X-Hook");
+               assert(header);
                assert(strcmp(header, "input") == 0);
        }
 
@@ -332,6 +333,7 @@ GotKillCb(struct evrpc_status *status,
                struct evhttp_request *req = status->http_req;
                const char *header = evhttp_find_header(
                        req->input_headers, "X-Pool-Hook");
+               assert(header);
                assert(strcmp(header, "ran") == 0);
        }