Fix even more coverity warnings.

diff --git a/evrpc.c b/evrpc.c
index 83230d4c7160d486e89b31744c3ea3aa17a8a23a..2443ab27937adfbeb8b750cdf960b56d4db7dba8 100644 (file)
--- a/evrpc.c
+++ b/evrpc.c
@@ -492,8 +492,7 @@ evrpc_request_done_closure(void *arg, enum EVRPC_HOOK_RESULT hook_res)
        return;
 
 error:
-       if (rpc_state != NULL)
-               evrpc_reqstate_free_(rpc_state);
+       evrpc_reqstate_free_(rpc_state);
        evhttp_send_error(req, HTTP_SERVUNAVAIL, NULL);
        return;
 }

diff --git a/test/regress_buffer.c b/test/regress_buffer.c
index 3be557481c7eee1e956780e917151cf85cd068a3..ccb14870a5be8c6e2f7e8c0c2726321ab8e4e243 100644 (file)
--- a/test/regress_buffer.c
+++ b/test/regress_buffer.c
@@ -1827,6 +1827,7 @@ test_evbuffer_prepend(void *ptr)
        evbuffer_validate(buf2);
        evbuffer_validate(buf1);
        n = evbuffer_remove(buf2, tmp, sizeof(tmp)-1);
+       tt_int_op(n, >=, 0);
        tmp[n]='\0';
        tt_str_op(tmp,==,"Here is string 1000. Here is string 999. ");
 

diff --git a/test/regress_http.c b/test/regress_http.c
index c87a3b6489998410e83d4ed08bea52381ce9b4dd..ca7d5155bf140db381bd422b9b67b22c6cc096c0 100644 (file)
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -584,7 +584,7 @@ http_bad_request_test(void *arg)
        struct basic_test_data *data = arg;
        struct timeval tv;
        struct bufferevent *bev = NULL;
-       evutil_socket_t fd;
+       evutil_socket_t fd = -1;
        const char *http_request;
        ev_uint16_t port=0, port2=0;
 
@@ -658,6 +658,8 @@ end:
        evhttp_free(http);
        if (bev)
                bufferevent_free(bev);
+       if (fd >= 0)
+               evutil_closesocket(fd);
 }
 
 static struct evhttp_connection *delayed_client;
@@ -704,7 +706,7 @@ http_delete_test(void *arg)
 {
        struct basic_test_data *data = arg;
        struct bufferevent *bev;
-       evutil_socket_t fd;
+       evutil_socket_t fd = -1;
        const char *http_request;
        ev_uint16_t port = 0;
 
@@ -737,7 +739,8 @@ http_delete_test(void *arg)
 
        tt_int_op(test_ok, ==, 2);
  end:
-       ;
+       if (fd >= 0)
+               evutil_closesocket(fd);
 }
 
 static void
@@ -785,7 +788,7 @@ http_on_complete_test(void *arg)
 {
        struct basic_test_data *data = arg;
        struct bufferevent *bev;
-       evutil_socket_t fd;
+       evutil_socket_t fd = -1;
        const char *http_request;
        ev_uint16_t port = 0;
 
@@ -794,6 +797,7 @@ http_on_complete_test(void *arg)
        http = http_setup(&port, data->base, 0);
 
        fd = http_connect("127.0.0.1", port);
+       tt_int_op(fd, >=, 0);
 
        /* Stupid thing to send a request */
        bev = bufferevent_socket_new(data->base, fd, 0);
@@ -811,13 +815,13 @@ http_on_complete_test(void *arg)
        event_base_dispatch(data->base);
 
        bufferevent_free(bev);
-       evutil_closesocket(fd);
 
        evhttp_free(http);
 
        tt_int_op(test_ok, ==, 4);
  end:
-       ;
+       if (fd >= 0)
+               evutil_closesocket(fd);
 }
 
 static void
@@ -844,7 +848,7 @@ http_allowed_methods_test(void *arg)
 {
        struct basic_test_data *data = arg;
        struct bufferevent *bev1, *bev2, *bev3;
-       evutil_socket_t fd1, fd2, fd3;
+       evutil_socket_t fd1=-1, fd2=-1, fd3=-1;
        const char *http_request;
        char *result1=NULL, *result2=NULL, *result3=NULL;
        ev_uint16_t port = 0;
@@ -915,9 +919,6 @@ http_allowed_methods_test(void *arg)
        bufferevent_free(bev1);
        bufferevent_free(bev2);
        bufferevent_free(bev3);
-       evutil_closesocket(fd1);
-       evutil_closesocket(fd2);
-       evutil_closesocket(fd3);
 
        evhttp_free(http);
 
@@ -940,6 +941,12 @@ http_allowed_methods_test(void *arg)
                free(result2);
        if (result3)
                free(result3);
+       if (fd1 >= 0)
+               evutil_closesocket(fd1);
+       if (fd2 >= 0)
+               evutil_closesocket(fd2);
+       if (fd3 >= 0)
+               evutil_closesocket(fd3);
 }
 
 static void http_request_done(struct evhttp_request *, void *);
@@ -1851,7 +1858,7 @@ http_failure_test(void *arg)
 {
        struct basic_test_data *data = arg;
        struct bufferevent *bev;
-       evutil_socket_t fd;
+       evutil_socket_t fd = -1;
        const char *http_request;
        ev_uint16_t port = 0;
 
@@ -1874,13 +1881,13 @@ http_failure_test(void *arg)
        event_base_dispatch(data->base);
 
        bufferevent_free(bev);
-       evutil_closesocket(fd);
 
        evhttp_free(http);
 
        tt_int_op(test_ok, ==, 2);
  end:
-       ;
+       if (fd >= 0)
+               evutil_closesocket(fd);
 }
 
 static void
@@ -2749,7 +2756,8 @@ http_incomplete_test_(struct basic_test_data *data, int use_timeout)
 
        tt_int_op(test_ok, ==, 2);
  end:
-       ;
+       if (fd >= 0)
+               evutil_closesocket(fd);
 }
 static void
 http_incomplete_test(void *arg)