Merge "chan_pjsip.c: Check for channel and session to not be NULL in hangup" into 13

channels/chan_pjsip.c

@@ -2078,8 +2078,16 @@ static int hangup(void *data)
 	struct hangup_data *h_data = data;
 	struct ast_channel *ast = h_data->chan;
 	struct ast_sip_channel_pvt *channel = ast_channel_tech_pvt(ast);
+
+	/*
+	 * Before cleaning we have to ensure that channel or its session is not NULL
+	 * we have seen rare case when taskprocessor calls hangup but channel is NULL
+	 * due to SIP session timeout and answer happening at the same time
+	 */
+	if (channel) {
 		struct chan_pjsip_pvt *pvt = channel->pvt;
 		struct ast_sip_session *session = channel->session;
+		if (session) {
 			int cause = h_data->cause;
 
 			/*
@@ -2090,7 +2098,9 @@ static int hangup(void *data)
 			ast_sip_session_terminate(ao2_bump(session), cause);
 			clear_session_and_channel(session, ast, pvt);
 			ao2_cleanup(session);
+		}
 		ao2_cleanup(channel);
+	}
 	ao2_cleanup(h_data);
 	return 0;
 }