Changeset 2205 for pjproject/trunk/pjsip/src/pjsip/sip_uri.c

Timestamp:

Aug 12, 2008 10:55:28 AM (16 years ago)

Author:

bennylp

Message:

Ticket #592: URI comparison may crash the application (thanks Pedro Gonçalves for the report)

File:

• pjproject/trunk/pjsip/src/pjsip/sip_uri.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_uri.c

@@ -602 +602 @@
     int d;
 
+    /* Check that naddr2 is also a name_addr */
+    if (naddr1->vptr != naddr2->vptr)
+        return -1;
+
     /* I'm not sure whether display name is included in the comparison. */
     if (pj_strcmp(&naddr1->display, &naddr2->display) != 0) {
@@ -685 +689 @@
 {
     PJ_UNUSED_ARG(context);
+
+    /* Check that uri2 is also an other_uri */
+    if (uri1->vptr != uri2->vptr)
+        return -1;
     
     /* Scheme must match. */