Changeset 3190 for pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

Timestamp:

Jun 2, 2010 3:03:43 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1092 (Crash when receiving various messages with "Contact: *" header format)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_dialog.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_dialog.c

@@ -433 +433 @@
                                          pos);
         if (contact_hdr) {
-            if (!PJSIP_URI_SCHEME_IS_SIP(contact_hdr->uri) && 
-                !PJSIP_URI_SCHEME_IS_SIPS(contact_hdr->uri))
+            if (!contact_hdr->uri ||
+                (!PJSIP_URI_SCHEME_IS_SIP(contact_hdr->uri) &&
+                 !PJSIP_URI_SCHEME_IS_SIPS(contact_hdr->uri)))
             {
                 pos = (pjsip_hdr*)contact_hdr->next;
@@ -612 +613 @@
     contact = (const pjsip_contact_hdr*)
               pjsip_msg_find_hdr(msg, PJSIP_H_CONTACT, NULL);
-    if (contact == NULL)
+    if (contact == NULL || contact->uri == NULL)
         return PJSIP_EMISSINGHDR;
 
@@ -1502 +1503 @@
 
 
-/* This function is called by user agent upon receiving incoming response
+/* This function is called by user agent upon receiving incoming request
  * message.
  */
@@ -1589 +1590 @@
                   pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
-        if (contact && (dlg->remote.contact==NULL ||
-                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
-                                      dlg->remote.contact->uri, 
-                                      contact->uri)))
+        if (contact && contact->uri &&
+            (dlg->remote.contact==NULL ||
+             pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI,
+                           dlg->remote.contact->uri,
+                           contact->uri)))
         {
             dlg->remote.contact = (pjsip_contact_hdr*) 
@@ -1794 +1796 @@
                   pjsip_msg_find_hdr(rdata->msg_info.msg, PJSIP_H_CONTACT, 
                                      NULL);
-        if (contact && (dlg->remote.contact==NULL ||
-                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
-                                      dlg->remote.contact->uri, 
-                                      contact->uri)))
+        if (contact && contact->uri &&
+            (dlg->remote.contact==NULL ||
+             pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI,
+                           dlg->remote.contact->uri,
+                           contact->uri)))
         {
             dlg->remote.contact = (pjsip_contact_hdr*) 
@@ -1844 +1847 @@
                                                           PJSIP_H_CONTACT, 
                                                           NULL);
-        if (contact && (dlg->remote.contact==NULL ||
-                        pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, 
-                                      dlg->remote.contact->uri, 
-                                      contact->uri)))
+        if (contact && contact->uri &&
+            (dlg->remote.contact==NULL ||
+             pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI,
+                           dlg->remote.contact->uri,
+                           contact->uri)))
         {
             dlg->remote.contact = (pjsip_contact_hdr*)