Changeset 2303

Timestamp:

Sep 21, 2008 10:01:46 PM (16 years ago)

Author:

bennylp

Message:

Ticket #639: added torture tests for handling non-ASCII UTF-8 characters in SIP message elements

Location:

pjproject/trunk/pjsip/src/test-pjsip

Files:

• msg_test.c (modified) (3 diffs)
• transport_test.c (modified) (1 diff)
• uri_test.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/test-pjsip/msg_test.c

@@ -807 +807 @@
 static int hdr_test_via_ipv6_3(pjsip_hdr *h);
 static int hdr_test_retry_after1(pjsip_hdr *h);
+static int hdr_test_subject_utf(pjsip_hdr *h);
 
 
@@ -1023 +1024 @@
         "10(Already Pending Register)",
         &hdr_test_retry_after1
+    },
+
+    {
+        /* Non-ASCII UTF-8 characters in Subject */
+        "Subject", NULL,
+        "\xC0\x81",
+        &hdr_test_subject_utf
     }
 };
@@ -1695 +1703 @@
     if (pj_strcmp2(&hdr->comment, "Already Pending Register"))
         return -2930;
+
+    return 0;
+}
+
+/* Subject: \xC0\x81 */
+static int hdr_test_subject_utf(pjsip_hdr *h)
+{
+    pjsip_subject_hdr *hdr = (pjsip_subject_hdr*)h;
+
+    if (pj_strcmp2(&h->name, "Subject"))
+        return -2950;
+
+    if (pj_strcmp2(&hdr->hvalue, "\xC0\x81"))
+        return -2960;
 
     return 0;

pjproject/trunk/pjsip/src/test-pjsip/transport_test.c

@@ -652 +652 @@
 {
     pjsip_module    mod;
-    pj_uint32_t     next_seq;
+    pj_int32_t      next_seq;
     pj_bool_t       err;
 } mod_load = 

pjproject/trunk/pjsip/src/test-pjsip/uri_test.c

@@ -79 +79 @@
 static pjsip_uri *create_uri35( pj_pool_t *pool );
 static pjsip_uri *create_uri36( pj_pool_t *pool );
+static pjsip_uri *create_uri37( pj_pool_t *pool );
+static pjsip_uri *create_uri38( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
@@ -333 +335 @@
         &create_uri36,
         "sip:[::1];maddr=[::01]"
+    },
+    {
+        /* 37: Non-ASCII UTF-8 in display name, with quote */
+        PJ_SUCCESS,
+        "\"\xC0\x81\" <sip:localhost>",
+        &create_uri37,
+        "\"\xC0\x81\" <sip:localhost>"
+    },
+    {
+        /* 38: Non-ASCII UTF-8 in display name, without quote */
+        PJ_SUCCESS,
+        "\xC0\x81 <sip:localhost>",
+        &create_uri38,
+        "\"\xC0\x81\" <sip:localhost>"
     }
 
@@ -704 +720 @@
     url->maddr_param = pj_str("::01");
     return (pjsip_uri*)url;
+
+}
+
+/* "\"\xC0\x81\" <sip:localhost>" */
+static pjsip_uri *create_uri37( pj_pool_t *pool )
+{
+    pjsip_name_addr *name;
+    pjsip_sip_uri *url;
+
+    name = pjsip_name_addr_create(pool);
+    name->display = pj_str("\xC0\x81");
+
+    url = pjsip_sip_uri_create(pool, 0);
+    url->host = pj_str("localhost");
+    
+    name->uri = (pjsip_uri*)url;
+
+    return (pjsip_uri*)name;
+
+}
+
+/* "\xC0\x81 <sip:localhost>" */
+static pjsip_uri *create_uri38( pj_pool_t *pool )
+{
+    pjsip_name_addr *name;
+    pjsip_sip_uri *url;
+
+    name = pjsip_name_addr_create(pool);
+    name->display = pj_str("\xC0\x81");
+
+    url = pjsip_sip_uri_create(pool, 0);
+    url->host = pj_str("localhost");
+    
+    name->uri = (pjsip_uri*)url;
+
+    return (pjsip_uri*)name;
 
 }