From: Kinsey Moore Date: Tue, 3 Sep 2013 18:09:02 +0000 (+0000) Subject: Prevent a crash in res_pjsip_dtmf_info.c X-Git-Tag: 13.0.0-beta1~1135 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5542ab1e7d8780b541e1c3803dc8d4e4983d8ea;p=thirdparty%2Fasterisk.git Prevent a crash in res_pjsip_dtmf_info.c This change makes sure that a content type header exists before checking the contents of the header against known SIP INFO DTMF content types. ........ Merged revisions 398206 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@398207 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_pjsip_dtmf_info.c b/res/res_pjsip_dtmf_info.c index 72f93dc46c..6a1ce20ff0 100644 --- a/res/res_pjsip_dtmf_info.c +++ b/res/res_pjsip_dtmf_info.c @@ -34,8 +34,9 @@ static int is_media_type(pjsip_rx_data *rdata, char *subtype) { - return !pj_strcmp2(&rdata->msg_info.ctype->media.type, "application") && - !pj_strcmp2(&rdata->msg_info.ctype->media.subtype, subtype); + return rdata->msg_info.ctype + && !pj_strcmp2(&rdata->msg_info.ctype->media.type, "application") + && !pj_strcmp2(&rdata->msg_info.ctype->media.subtype, subtype); } static void send_response(struct ast_sip_session *session,