Changeset 5191 for pjproject/trunk

Timestamp:

Oct 23, 2015 9:50:16 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Only check 'hide' URI parameter on SIP/SIPS URIs in printing route header, otherwise it may cause crash as other URI types may not have 'other_param' field (thanks thanks Fredrik Hansson for the patch).

File:

• pjproject/trunk/pjsip/src/pjsip/sip_msg.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsip/sip_msg.c

@@ -1703 +1703 @@
      * if it exists in the route URI.
      */
-    sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(hdr->name_addr.uri);
-    p = sip_uri->other_param.next;
-    while (p != &sip_uri->other_param) {
-        const pj_str_t st_hide = {"hide", 4};
-
-        if (pj_stricmp(&p->name, &st_hide) == 0) {
-            /* Check if param 'hide' is specified without 'lr'. */
-            pj_assert(sip_uri->lr_param != 0);
-            return 0;
+    if (PJSIP_URI_SCHEME_IS_SIPS(hdr->name_addr.uri) ||
+        PJSIP_URI_SCHEME_IS_SIP(hdr->name_addr.uri))
+    {
+        sip_uri = (pjsip_sip_uri*) pjsip_uri_get_uri(hdr->name_addr.uri);
+        p = sip_uri->other_param.next;
+        while (p != &sip_uri->other_param) {
+            const pj_str_t st_hide = {"hide", 4};
+
+            if (pj_stricmp(&p->name, &st_hide) == 0) {
+                /* Check if param 'hide' is specified without 'lr'. */
+                pj_assert(sip_uri->lr_param != 0);
+                return 0;
+            }
+            p = p->next;
         }
-        p = p->next;
     }