diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-26 10:09:13 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-26 10:09:13 -0400 |
| commit | 7ef04e4b4838f011ea13a0ca13b0ef5263e9362b (patch) | |
| tree | 06d92a66ac344169e28de2aef43804ef939556ca /test/regress_bufferevent.c | |
| parent | 13525c50ebb81c38d655192990425b2610b1e9aa (diff) | |
| parent | 3cde5bf57a993e61a735c53999160e8c480d85f2 (diff) | |
| download | libevent-7ef04e4b4838f011ea13a0ca13b0ef5263e9362b.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
configure.in
test/regress_buffer.c
test/regress_dns.c
Diffstat (limited to 'test/regress_bufferevent.c')
| -rw-r--r-- | test/regress_bufferevent.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index 06b8831f..335ed44d 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -256,6 +256,8 @@ test_bufferevent_watermarks_impl(int use_pair) bev1 = bufferevent_new(pair[0], NULL, wm_writecb, wm_errorcb, NULL); bev2 = bufferevent_new(pair[1], wm_readcb, NULL, wm_errorcb, NULL); } + tt_assert(bev1); + tt_assert(bev2); bufferevent_disable(bev1, EV_READ); bufferevent_enable(bev2, EV_READ); @@ -280,8 +282,10 @@ test_bufferevent_watermarks_impl(int use_pair) tt_assert(!event_pending(&bev2->ev_write, EV_WRITE, NULL)); end: - bufferevent_free(bev1); - bufferevent_free(bev2); + if (bev1) + bufferevent_free(bev1); + if (bev2) + bufferevent_free(bev2); } static void @@ -390,8 +394,10 @@ test_bufferevent_filters_impl(int use_pair) test_ok = 0; end: - bufferevent_free(bev1); - bufferevent_free(bev2); + if (bev1) + bufferevent_free(bev1); + if (bev2) + bufferevent_free(bev2); } |