summaryrefslogtreecommitdiff
path: root/src/protocol/pubsub/sub.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocol/pubsub/sub.c')
-rw-r--r--src/protocol/pubsub/sub.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/protocol/pubsub/sub.c b/src/protocol/pubsub/sub.c
index 9390b0d2..cd8dd87c 100644
--- a/src/protocol/pubsub/sub.c
+++ b/src/protocol/pubsub/sub.c
@@ -65,12 +65,14 @@ nni_sub_sock_fini(void *arg)
nni_sub_sock *sub = arg;
nni_sub_topic *topic;
- while ((topic = nni_list_first(&sub->topics)) != NULL) {
- nni_list_remove(&sub->topics, topic);
- nni_free(topic->buf, topic->len);
- NNI_FREE_STRUCT(topic);
+ if (sub != NULL) {
+ while ((topic = nni_list_first(&sub->topics)) != NULL) {
+ nni_list_remove(&sub->topics, topic);
+ nni_free(topic->buf, topic->len);
+ NNI_FREE_STRUCT(topic);
+ }
+ NNI_FREE_STRUCT(sub);
}
- NNI_FREE_STRUCT(sub);
}
@@ -94,7 +96,9 @@ nni_sub_pipe_fini(void *arg)
{
nni_sub_pipe *sp = arg;
- NNI_FREE_STRUCT(sp);
+ if (sp != NULL) {
+ NNI_FREE_STRUCT(sp);
+ }
}