From 83c6ebbae87a21a239e906988c9bb8f68d3f7ee9 Mon Sep 17 00:00:00 2001
From: Kevin Harwell <kharwell@digium.com>
Date: Mon, 8 Jul 2019 18:10:07 -0500
Subject: [PATCH] stasis_state: Make unsubscribes NULL tolerant
Regular stasis unsubscribes can handle NULL subscription objects. This patch
makes it so stasis state unsubscribes handles NULL's as well.
ASTERISK-28442
Change-Id: Ic3648e8df043a85b77cff085e9ff10356028e479
---
main/stasis_state.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/main/stasis_state.c b/main/stasis_state.c
index 2a9afcb717..a9159724d0 100644
--- a/main/stasis_state.c
+++ b/main/stasis_state.c
@@ -514,8 +514,11 @@ void *stasis_state_unsubscribe(struct stasis_state_subscriber *sub)
void *stasis_state_unsubscribe_and_join(struct stasis_state_subscriber *sub)
{
- sub->stasis_sub = stasis_unsubscribe_and_join(sub->stasis_sub);
- ao2_ref(sub, -1);
+ if (sub) {
+ sub->stasis_sub = stasis_unsubscribe_and_join(sub->stasis_sub);
+ ao2_ref(sub, -1);
+ }
+
return NULL;
}
--
GitLab