diff options
| author | Joshua Colp <jcolp@digium.com> | 2014-01-07 14:56:10 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2014-01-07 14:56:10 +0000 |
| commit | f89ab79862721aba9bfe89d945ea27b2f14c844c (patch) | |
| tree | efa2be8eaa5f88c89d4ea07f8908c5fe5479b326 /res/res_pjsip_nat.c | |
| parent | e95e66cedefae2026b22987fe2e8314c3a9dc8dc (diff) | |
res_pjsip_nat: Don't assume a Contact header will always contain a URI.
If the 'rewrite_contact' option was enabled and a Contact header was received
which contained a '*' a crash would occur.
This change makes the res_pjsip_nat module ignore the Contact header if it
contains only a '*'.
(closes issue ASTERISK-23101)
Reported by: Matt Jordan
........
Merged revisions 405019 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_nat.c')
| -rw-r--r-- | res/res_pjsip_nat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c index 9a3f500b9..3416fffc6 100644 --- a/res/res_pjsip_nat.c +++ b/res/res_pjsip_nat.c @@ -42,7 +42,7 @@ static pj_bool_t nat_on_rx_message(pjsip_rx_data *rdata) } if (endpoint->nat.rewrite_contact && (contact = pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, NULL)) && - (PJSIP_URI_SCHEME_IS_SIP(contact->uri) || PJSIP_URI_SCHEME_IS_SIPS(contact->uri))) { + !contact->star && (PJSIP_URI_SCHEME_IS_SIP(contact->uri) || PJSIP_URI_SCHEME_IS_SIPS(contact->uri))) { pjsip_sip_uri *uri = pjsip_uri_get_uri(contact->uri); pj_cstr(&uri->host, rdata->pkt_info.src_name); |