Changeset 4375 for pjproject/branches/1.x

Timestamp:

Feb 27, 2013 9:28:31 AM (12 years ago)

Author:

ming

Message:

Re #1558: backported r4209,r4210 to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib-util/src/pjlib-util/scanner.c (modified) (1 diff)
• pjsip/src/test/uri_test.c (modified) (4 diffs)

pjproject/branches/1.x/pjlib-util/src/pjlib-util/scanner.c

@@ -394 +394 @@
                     /* break from main loop if we have odd number of backslashes */
                     if (((unsigned)(q-r) & 0x01) == 1) {
-                        ++s;
                         break;
                     }

pjproject/branches/1.x/pjsip/src/test/uri_test.c

@@ -68 +68 @@
 static pjsip_uri *create_uri16( pj_pool_t *pool );
 static pjsip_uri *create_uri17( pj_pool_t *pool );
+static pjsip_uri *create_uri18( pj_pool_t *pool );
 static pjsip_uri *create_uri25( pj_pool_t *pool );
 static pjsip_uri *create_uri26( pj_pool_t *pool );
@@ -82 +83 @@
 static pjsip_uri *create_uri37( pj_pool_t *pool );
 static pjsip_uri *create_uri38( pj_pool_t *pool );
+static pjsip_uri *create_uri39( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
@@ -350 +352 @@
         &create_uri38,
         "\"\xC0\x81\" <sip:localhost>"
+    },
+    {
+        /* Even number of backslash before end quote in display name. */
+        PJ_SUCCESS,
+        "\"User\\\\\" <sip:localhost>",
+        &create_uri39,
     }
 
@@ -758 +766 @@
     return (pjsip_uri*)name;
 
+}
+
+/* "\"User\\\\\" <sip:localhost>" */
+static pjsip_uri *create_uri39(pj_pool_t *pool)
+{
+    pjsip_name_addr *name_addr = pjsip_name_addr_create(pool);
+    pjsip_sip_uri *url;
+
+    url = pjsip_sip_uri_create(pool, 0);
+    name_addr->uri = (pjsip_uri*) url;
+
+    pj_strdup2(pool, &name_addr->display, "User\\\\");
+    pj_strdup2(pool, &url->host, "localhost");
+    return (pjsip_uri*)name_addr;
 }