test-fdleak: fix memory leaks

Fixes: #726

diff --git a/test/test-fdleak.c b/test/test-fdleak.c
index 4c4eba25e70e5b60afddf3234538cf056c49ec2e..a1fb4ed13bd28e34cf3fb3703f01febc194a6813 100644 (file)
--- a/test/test-fdleak.c
+++ b/test/test-fdleak.c
@@ -95,8 +95,11 @@ server_event_cb(struct bufferevent *bev, short events, void *ctx)
        if (events & BEV_EVENT_ERROR) {
                my_perror("Error from bufferevent");
                exit(1);
-       } else if (events & (BEV_EVENT_EOF | BEV_EVENT_ERROR)) {
+       } else if (events & BEV_EVENT_EOF) {
                bufferevent_free(bev);
+               if (num_requests == MAX_REQUESTS) {
+                       event_base_loopbreak(bufferevent_get_base(bev));
+               }
        }
 }
 
@@ -107,8 +110,7 @@ listener_accept_cb(struct evconnlistener *listener, evutil_socket_t sock,
 {
        struct event_base *base = evconnlistener_get_base(listener);
        struct bufferevent *bev = bufferevent_socket_new(base, sock,
-                                                         BEV_OPT_CLOSE_ON_FREE);
-
+               BEV_OPT_CLOSE_ON_FREE);
        bufferevent_setcb(bev, server_read_cb, NULL, server_event_cb, NULL);
        bufferevent_enable(bev, EV_READ|EV_WRITE);
 }
@@ -154,6 +156,9 @@ start_loop(void)
        start_client(base);
 
        event_base_dispatch(base);
+
+       evconnlistener_free(listener);
+       event_base_free(base);
 }
 
 /*
@@ -178,9 +183,7 @@ client_read_cb(struct bufferevent *bev, void *ctx)
        bufferevent_free(bev);
 
        num_requests++;
-       if (num_requests == MAX_REQUESTS) {
-               event_base_loopbreak(base);
-       } else {
+       if (++num_requests < MAX_REQUESTS) {
                start_client(base);
        }
 }