diff options
| -rw-r--r-- | test/regress_bufferevent.c | 4 | ||||
| -rw-r--r-- | test/regress_dns.c | 11 | ||||
| -rw-r--r-- | test/regress_http.c | 7 | ||||
| -rw-r--r-- | test/regress_listener.c | 4 | ||||
| -rw-r--r-- | test/regress_rpc.c | 1 | ||||
| -rw-r--r-- | test/regress_zlib.c | 6 |
6 files changed, 23 insertions, 10 deletions
diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index 1960077b..49ec004b 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -345,10 +345,10 @@ test_bufferevent_filters_impl(int use_pair) buffer[i] = i; bev1 = bufferevent_filter_new(bev1, NULL, bufferevent_output_filter, - 0, NULL, NULL); + BEV_OPT_CLOSE_ON_FREE, NULL, NULL); bev2 = bufferevent_filter_new(bev2, bufferevent_input_filter, - NULL, 0, NULL, NULL); + NULL, BEV_OPT_CLOSE_ON_FREE, NULL, NULL); bufferevent_setcb(bev1, NULL, writecb, errorcb, NULL); bufferevent_setcb(bev2, readcb, NULL, errorcb, NULL); diff --git a/test/regress_dns.c b/test/regress_dns.c index cb3e135c..2ffd94b8 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -438,7 +438,9 @@ struct generic_dns_callback_result { char type; int count; int ttl; + size_t addrs_len; void *addrs; + char addrs_buf[256]; }; static void @@ -459,12 +461,15 @@ generic_dns_callback(int result, char type, int count, int ttl, void *addresses, else if (type == DNS_PTR) len = strlen(addresses)+1; else { - len = 0; + res->addrs_len = len = 0; res->addrs = NULL; } if (len) { - res->addrs = malloc(len); - memcpy(res->addrs, addresses, len); + res->addrs_len = len; + if (len > 256) + len = 256; + memcpy(res->addrs_buf, addresses, len); + res->addrs = res->addrs_buf; } if (--n_replies_left == 0) diff --git a/test/regress_http.c b/test/regress_http.c index 43e1d083..e2c8078e 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -495,7 +495,7 @@ static void http_bad_request_test(void) { struct timeval tv; - struct bufferevent *bev; + struct bufferevent *bev = NULL; evutil_socket_t fd; const char *http_request; short port = -1; @@ -564,6 +564,8 @@ http_bad_request_test(void) end: evhttp_free(http); + if (bev) + bufferevent_free(bev); } static struct evhttp_connection *delayed_client; @@ -2530,7 +2532,7 @@ static void terminate_chunked_trickle_cb(evutil_socket_t fd, short events, void *arg) { struct terminate_state *state = arg; - struct evbuffer *evb = evbuffer_new(); + struct evbuffer *evb; struct timeval tv; if (evhttp_request_get_connection(state->req) == NULL) { @@ -2540,6 +2542,7 @@ terminate_chunked_trickle_cb(evutil_socket_t fd, short events, void *arg) return; } + evb = evbuffer_new(); evbuffer_add_printf(evb, "%p", evb); evhttp_send_reply_chunk(state->req, evb); evbuffer_free(evb); diff --git a/test/regress_listener.c b/test/regress_listener.c index 80adad03..b2e61468 100644 --- a/test/regress_listener.c +++ b/test/regress_listener.c @@ -127,6 +127,10 @@ end: EVUTIL_CLOSESOCKET(fd2); if (fd3>=0) EVUTIL_CLOSESOCKET(fd3); + if (listener1) + evconnlistener_free(listener1); + if (listener2) + evconnlistener_free(listener2); } diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 3b6cdf38..482f9a77 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -592,6 +592,7 @@ rpc_hook_pause_cb(evutil_socket_t fd, short what, void *arg) struct _rpc_hook_ctx *ctx = arg; ++hook_pause_cb_called; evrpc_resume_request(ctx->vbase, ctx->ctx, EVRPC_CONTINUE); + free(arg); } static int diff --git a/test/regress_zlib.c b/test/regress_zlib.c index d20f29f3..a301eaf3 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -275,10 +275,10 @@ test_bufferevent_zlib(void *arg) r = inflateInit(&z_input); /* initialize filters */ - bev1 = bufferevent_filter_new(bev1, NULL, zlib_output_filter, 0, - zlib_deflate_free, &z_output); + bev1 = bufferevent_filter_new(bev1, NULL, zlib_output_filter, + BEV_OPT_CLOSE_ON_FREE, zlib_deflate_free, &z_output); bev2 = bufferevent_filter_new(bev2, zlib_input_filter, - NULL, 0, zlib_inflate_free, &z_input); + NULL, BEV_OPT_CLOSE_ON_FREE, zlib_inflate_free, &z_input); bufferevent_setcb(bev1, readcb, writecb, errorcb, NULL); bufferevent_setcb(bev2, readcb, writecb, errorcb, NULL); |