Changeset 3190 for pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

Timestamp:

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

Author:

bennylp

Message:

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

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_inv.c

@@ -751 +751 @@
     pjsip_supported_hdr *sup_hdr;
     pjsip_require_hdr *req_hdr;
+    pjsip_contact_hdr *c_hdr;
     int code = 200;
     unsigned rem_option = 0;
@@ -784 +785 @@
     /* Init response header list */
     pj_list_init(&res_hdr_list);
+
+    /* Check the Contact header */
+    c_hdr = (pjsip_contact_hdr*)
+            pjsip_msg_find_hdr(msg, PJSIP_H_CONTACT, NULL);
+    if (!c_hdr || !c_hdr->uri) {
+        /* Missing Contact header or Contact contains "*" */
+        pjsip_warning_hdr *w;
+        pj_str_t warn_text;
+
+        warn_text = pj_str("Bad/missing Contact header");
+        w = pjsip_warning_hdr_create(rdata->tp_info.pool, 399,
+                                     pjsip_endpt_name(endpt),
+                                     &warn_text);
+        if (w) {
+            pj_list_push_back(&res_hdr_list, w);
+        }
+
+        code = PJSIP_SC_BAD_REQUEST;
+        status = PJSIP_ERRNO_FROM_SIP_STATUS(code);
+        goto on_return;
+    }
 
     /* Check the request body, see if it's something that we support,