diff options
Diffstat (limited to 'src/protocol/survey')
| -rw-r--r-- | src/protocol/survey/respond.c | 16 | ||||
| -rw-r--r-- | src/protocol/survey/survey.c | 10 |
2 files changed, 17 insertions, 9 deletions
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); + } } diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c index 22baf2e8..c7ce1c16 100644 --- a/src/protocol/survey/survey.c +++ b/src/protocol/survey/survey.c @@ -82,8 +82,10 @@ nni_surv_sock_fini(void *arg) { nni_surv_sock *psock = arg; - nni_cv_fini(&psock->cv); - NNI_FREE_STRUCT(psock); + if (psock != NULL) { + nni_cv_fini(&psock->cv); + NNI_FREE_STRUCT(psock); + } } @@ -114,7 +116,9 @@ nni_surv_pipe_fini(void *arg) { nni_surv_pipe *sp = arg; - NNI_FREE_STRUCT(sp); + if (sp != NULL) { + NNI_FREE_STRUCT(sp); + } } |