From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 21 Jun 2017 22:57:11 +0000 (-0500)
Subject: res_pjsip_mwi.c: Eliminate RAII_VAR in contact delete observer
X-Git-Tag: 13.17.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=764d04fa8705d9e5c2e7aee8a6f1c774d7d28595;p=thirdparty%2Fasterisk.git

res_pjsip_mwi.c: Eliminate RAII_VAR in contact delete observer

Change-Id: I0bc97c6608de1d1a4228826b3b3be43f162f05f3
---

diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index 513be8c3c4..05eee782e9 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -1245,8 +1245,8 @@ static void mwi_contact_deleted(const void *object)
 	const struct ast_sip_contact *contact = object;
 	struct ao2_iterator *mwi_subs;
 	struct mwi_subscription *mwi_sub;
-	RAII_VAR(struct ast_sip_endpoint *, endpoint, NULL, ao2_cleanup);
-	RAII_VAR(struct ast_sip_contact *, found_contact, NULL, ao2_cleanup);
+	struct ast_sip_endpoint *endpoint = NULL;
+	struct ast_sip_contact *found_contact;
 
 	if (contact->endpoint) {
 		endpoint = ao2_bump(contact->endpoint);
@@ -1257,12 +1257,15 @@ static void mwi_contact_deleted(const void *object)
 	}
 
 	if (!endpoint || ast_strlen_zero(endpoint->subscription.mwi.mailboxes)) {
+		ao2_cleanup(endpoint);
 		return;
 	}
 
 	/* Check if there is another contact */
 	found_contact = ast_sip_location_retrieve_contact_from_aor_list(endpoint->aors);
+	ao2_cleanup(endpoint);
 	if (found_contact) {
+		ao2_cleanup(found_contact);
 		return;
 	}