fix memory leaks/unitialized memory found by valgrind

svn:r418
This commit is contained in:
Niels Provos 2007-09-09 02:15:34 +00:00
parent e678f009a8
commit 8ee20a3fa4
2 changed files with 9 additions and 13 deletions

View File

@ -480,18 +480,6 @@ test_signal_dealloc(void)
signal_add(&ev, NULL); signal_add(&ev, NULL);
signal_del(&ev); signal_del(&ev);
event_base_free(base); event_base_free(base);
errno = EINTR;
if (base->sig.ev_signal_added) {
printf("ev_signal not removed (evsignal_dealloc needed) ");
test_ok = 0;
} else if (close(base->sig.ev_signal_pair[0]) != -1 ||
errno != EBADF) {
/* fd must be closed, so second close gives -1, EBADF */
printf("signal pipe still open (evsignal_dealloc needed) ");
test_ok = 0;
} else {
test_ok = 1;
}
cleanup_test(); cleanup_test();
} }
@ -700,7 +688,7 @@ test_bufferevent(void)
bufferevent_enable(bev2, EV_READ); bufferevent_enable(bev2, EV_READ);
for (i = 0; i < sizeof(buffer); i++) for (i = 0; i < sizeof(buffer); i++)
buffer[0] = i; buffer[i] = i;
bufferevent_write(bev1, buffer, sizeof(buffer)); bufferevent_write(bev1, buffer, sizeof(buffer));
@ -1033,6 +1021,8 @@ rpc_test(void)
msg_free(msg); msg_free(msg);
msg_free(msg2); msg_free(msg2);
evbuffer_free(tmp);
fprintf(stdout, "OK\n"); fprintf(stdout, "OK\n");
} }

View File

@ -104,10 +104,13 @@ MessageCb(EVRPC_STRUCT(Message)* rpc, void *arg)
EVRPC_REQUEST_DONE(rpc); EVRPC_REQUEST_DONE(rpc);
} }
static EVRPC_STRUCT(NeverReply) *saved_rpc;
void void
NeverReplyCb(EVRPC_STRUCT(NeverReply)* rpc, void *arg) NeverReplyCb(EVRPC_STRUCT(NeverReply)* rpc, void *arg)
{ {
test_ok += 1; test_ok += 1;
saved_rpc = rpc;
} }
static void static void
@ -541,6 +544,9 @@ rpc_client_timeout(void)
event_dispatch(); event_dispatch();
/* free the saved RPC structure up */
EVRPC_REQUEST_DONE(saved_rpc);
rpc_teardown(base); rpc_teardown(base);
if (test_ok != 2) { if (test_ok != 2) {