From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 10 Dec 2014 13:16:19 +0000 (+0000)
Subject: PJSIP: Fix assert on initial mass qualify
X-Git-Tag: 14.0.0-beta1~1404
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cba439c4d55ac94059393388da7b3ddbf206e01;p=thirdparty%2Fasterisk.git

PJSIP: Fix assert on initial mass qualify

This fixes the MWI test regressions caused by r429127 and ensures that
contacts have non-zero qualify_frequency before attempting scheduling.
........

Merged revisions 429245 from http://svn.asterisk.org/svn/asterisk/branches/12
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429247 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_pjsip/pjsip_options.c b/res/res_pjsip/pjsip_options.c
index ac8302fae4..f64c83f381 100644
--- a/res/res_pjsip/pjsip_options.c
+++ b/res/res_pjsip/pjsip_options.c
@@ -960,7 +960,9 @@ static int qualify_and_schedule_cb(void *obj, void *arg, int flags)
 	initial_interval = contact->qualify_frequency * 1000;
 	initial_interval = (int)(initial_interval * ast_random_double());
 
-	schedule_qualify(contact, initial_interval);
+	if (contact->qualify_frequency) {
+		schedule_qualify(contact, initial_interval);
+	}
 
 	return 0;
 }