From ac8415c24ffea645105c3859e814843e81c97f8a Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 16 Jan 2017 16:27:22 -0800 Subject: Start of event framework. This compiles correctly, but doesn't actually deliver events yet. As part of this, I've made most of the initializables in nng safe to tear-down if uninitialized (or set to zero e.g. via calloc). This makes it loads easier to write the teardown on error code, since I can deinit everything, without worrying about which things have been initialized and which have not. --- src/protocol/survey/respond.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/protocol/survey/respond.c') diff --git a/src/protocol/survey/respond.c b/src/protocol/survey/respond.c index 0cef5a68..3a4bf52d 100644 --- a/src/protocol/survey/respond.c +++ b/src/protocol/survey/respond.c @@ -67,11 +67,13 @@ nni_resp_sock_fini(void *arg) { nni_resp_sock *psock = arg; - nni_idhash_destroy(psock->pipes); - if (psock->btrace != NULL) { - nni_free(psock->btrace, psock->btrace_len); + if (psock != NULL) { + nni_idhash_destroy(psock->pipes); + if (psock->btrace != NULL) { + nni_free(psock->btrace, psock->btrace_len); + } + NNI_FREE_STRUCT(psock); } - NNI_FREE_STRUCT(psock); } @@ -101,8 +103,10 @@ nni_resp_pipe_fini(void *arg) { nni_resp_pipe *ppipe = arg; - nni_msgq_fini(ppipe->sendq); - NNI_FREE_STRUCT(ppipe); + if (ppipe != NULL) { + nni_msgq_fini(ppipe->sendq); + NNI_FREE_STRUCT(ppipe); + } } -- cgit v1.2.3-70-g09d2