[svn-commits] rmudgett: trunk r430958 - in /trunk: ./ res/res_pjsip_outbound_registration.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Jan 22 13:14:35 2015
New Revision: 430958

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430958
Log:
res_pjsip_outbound_registration.c: Minor code cleanup.

* Add an allocation failure check and assert in
sip_outbound_registration_response_cb().

* Made sip_outbound_registration_state_destroy() handle partially created
state objects from sip_outbound_registration_state_alloc().

Review: https://reviewboard.asterisk.org/r/4366/
........

Merged revisions 430957 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_outbound_registration.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_outbound_registration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_outbound_registration.c?view=diff&rev=430958&r1=430957&r2=430958
==============================================================================
--- trunk/res/res_pjsip_outbound_registration.c (original)
+++ trunk/res/res_pjsip_outbound_registration.c Thu Jan 22 13:14:35 2015
@@ -724,8 +724,14 @@
 static void sip_outbound_registration_response_cb(struct pjsip_regc_cbparam *param)
 {
 	RAII_VAR(struct sip_outbound_registration_client_state *, client_state, param->token, ao2_cleanup);
-	struct registration_response *response = ao2_alloc(sizeof(*response), registration_response_destroy);
-
+	struct registration_response *response;
+
+	ast_assert(client_state != NULL);
+
+	response = ao2_alloc(sizeof(*response), registration_response_destroy);
+	if (!response) {
+		return;
+	}
 	response->code = param->code;
 	response->expiration = param->expiration;
 	response->client_state = client_state;
@@ -753,10 +759,11 @@
 	ao2_cleanup(state->registration);
 
 	if (!state->client_state) {
-		return;
-	}
-
-	if (state->client_state->serializer && ast_sip_push_task(state->client_state->serializer, handle_client_state_destruction, state->client_state)) {
+		/* Nothing to do */
+	} else if (!state->client_state->serializer) {
+		ao2_ref(state->client_state, -1);
+	} else if (ast_sip_push_task(state->client_state->serializer,
+		handle_client_state_destruction, state->client_state)) {
 		ast_log(LOG_WARNING, "Failed to pass outbound registration client destruction to threadpool\n");
 		ao2_ref(state->client_state, -1);
 	}
@@ -773,19 +780,24 @@
 /*! \brief Allocator function for registration state */
 static struct sip_outbound_registration_state *sip_outbound_registration_state_alloc(struct sip_outbound_registration *registration)
 {
-	struct sip_outbound_registration_state *state = ao2_alloc(sizeof(*state), sip_outbound_registration_state_destroy);
-
-	if (!state || !(state->client_state = ao2_alloc(sizeof(*state->client_state), sip_outbound_registration_client_state_destroy))) {
+	struct sip_outbound_registration_state *state;
+
+	state = ao2_alloc(sizeof(*state), sip_outbound_registration_state_destroy);
+	if (!state) {
+		return NULL;
+	}
+	state->client_state = ao2_alloc(sizeof(*state->client_state),
+		sip_outbound_registration_client_state_destroy);
+	if (!state->client_state) {
 		ao2_cleanup(state);
 		return NULL;
 	}
 
-	if (!(state->client_state->serializer = ast_sip_create_serializer())) {
-		ao2_cleanup(state->client_state);
+	state->client_state->serializer = ast_sip_create_serializer();
+	if (!state->client_state->serializer) {
 		ao2_cleanup(state);
 		return NULL;
 	}
-
 	state->client_state->status = SIP_REGISTRATION_UNREGISTERED;
 	state->client_state->timer.user_data = state->client_state;
 	state->client_state->timer.cb = sip_outbound_registration_timer_cb;
@@ -970,9 +982,10 @@
 		}
 	}
 
-	if (!state->client_state->client &&
-		pjsip_regc_create(ast_sip_get_pjsip_endpoint(), state->client_state, sip_outbound_registration_response_cb,
-		&state->client_state->client) != PJ_SUCCESS) {
+	if (!state->client_state->client
+		&& pjsip_regc_create(ast_sip_get_pjsip_endpoint(), state->client_state,
+			sip_outbound_registration_response_cb,
+			&state->client_state->client) != PJ_SUCCESS) {
 		return -1;
 	}