res_pjsip: Check return from pjsip_parse_uri calls

Updated ast_sip_create_rdata_with_contact and registrar_find_contact
to check the return from pjsip_parse_uri before attempting to
use the uri returned.

ASTERISK-28402
Reported-by: Ross Beer
Change-Id: I9810b3b163c45ed5a56ec743586e5ce107f13ba7

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index b9c269e87943dc063aca21a2295085e50fa05737..a86ec17b34710f5f0d719e85927e02b7fcfb2c9b 100644 (file)
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -3791,6 +3791,10 @@ int ast_sip_create_rdata_with_contact(pjsip_rx_data *rdata, char *packet, const
                if (contact_hdr) {
                        contact_hdr->uri = pjsip_parse_uri(rdata->tp_info.pool, (char *)contact,
                                strlen(contact), PJSIP_PARSE_URI_AS_NAMEADDR);
+                       if (!contact_hdr->uri) {
+                               ast_log(LOG_WARNING, "Unable to parse contact URI from '%s'.\n", contact);
+                               return -1;
+                       }
                }
        }
 

diff --git a/res/res_pjsip_registrar.c b/res/res_pjsip_registrar.c
index 53f20a32401c92167f9ab23a31460db8489440e4..2848d5a7bac858f758cf35ff18f0c41f25a6ae15 100644 (file)
--- a/res/res_pjsip_registrar.c
+++ b/res/res_pjsip_registrar.c
@@ -129,6 +129,10 @@ static int registrar_find_contact(void *obj, void *arg, int flags)
        }
 
        contact_uri = pjsip_parse_uri(details->pool, (char*)contact->uri, strlen(contact->uri), 0);
+       if (!contact_uri) {
+               ast_log(LOG_WARNING, "Unable to parse contact URI from '%s'.\n", contact->uri);
+               return 0;
+       }
 
        return (pjsip_uri_cmp(PJSIP_URI_IN_CONTACT_HDR, details->uri, contact_uri) == PJ_SUCCESS) ? CMP_MATCH : 0;
 }