From: Jørgen H <asterisk.org@hovland.cx>
Date: Thu, 16 Feb 2017 10:16:47 +0000 (+0000)
Subject: res_pjsip: Fix crash when contact has no status
X-Git-Tag: 13.15.0-rc1~52^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0595c31da749b18a60d957b8685b93c96045cd68;p=thirdparty%2Fasterisk.git

res_pjsip: Fix crash when contact has no status

This change fixes an assumption in res_pjsip that a contact will
always have a status. There is a race condition where this is
not true and would crash. The status will now be unknown when
this situation occurs.

ASTERISK-26623 #close

Change-Id: Id52d3ca4d788562d236da49990a319118f8d22b5
---

diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c
index d4159f5080..d4ea911c95 100644
--- a/res/res_pjsip/pjsip_options.c
+++ b/res/res_pjsip/pjsip_options.c
@@ -1260,8 +1260,8 @@ int ast_sip_format_contact_ami(void *obj, void *arg, int flags)
 	if (!ast_strlen_zero(contact->call_id)) {
 		ast_str_append(&buf, 0, "CallID: %s\r\n", contact->call_id);
 	}
-	ast_str_append(&buf, 0, "Status: %s\r\n", ast_sip_get_contact_status_label(status->status));
-	if (status->status == UNKNOWN) {
+	ast_str_append(&buf, 0, "Status: %s\r\n", ast_sip_get_contact_status_label(status ? status->status : UNKNOWN));
+	if (!status || status->status == UNKNOWN) {
 		ast_str_append(&buf, 0, "RoundtripUsec: N/A\r\n");
 	} else {
 		ast_str_append(&buf, 0, "RoundtripUsec: %" PRId64 "\r\n", status->rtt);