Changeset 4641 for pjproject

Timestamp:

Nov 4, 2013 9:05:43 AM (11 years ago)

Author:

nanang

Message:

Fix #1709: Fixed scanner in processing escaped quote right after quote begin.

Location:

pjproject/trunk

Files:

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

pjproject/trunk/pjlib-util/src/pjlib-util/scanner.c

@@ -384 +384 @@
         if (*s == end_quote[qpair]) {
             if (*(s-1) == '\\') {
-                if (s-2 == scanner->begin) {
+                char *q = s-2;
+                char *r = s-2;
+
+                while (r != scanner->begin && *r == '\\') {
+                    --r;
+                }
+                /* break from main loop if we have odd number of backslashes */
+                if (((unsigned)(q-r) & 0x01) == 1) {
                     break;
-                } else {
-                    char *q = s-2;
-                    char *r = s-2;
-
-                    while (r != scanner->begin && *r == '\\') {
-                        --r;
-                    }
-                    /* break from main loop if we have odd number of backslashes */
-                    if (((unsigned)(q-r) & 0x01) == 1) {
-                        break;
-                    }
-                    ++s;
                 }
+                ++s;
             } else {
                 /* end_quote is not preceeded by backslash. break now. */

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

@@ -84 +84 @@
 static pjsip_uri *create_uri38( pj_pool_t *pool );
 static pjsip_uri *create_uri39( pj_pool_t *pool );
+static pjsip_uri *create_uri40( pj_pool_t *pool );
 static pjsip_uri *create_dummy( pj_pool_t *pool );
 
@@ -358 +359 @@
         "\"User\\\\\" <sip:localhost>",
         &create_uri39,
+    },
+    {
+        /* Quoted display name. */
+        PJ_SUCCESS,
+        "\"\\\"User\\\"\" <sip:localhost>",
+        &create_uri40,
     }
 
@@ -778 +785 @@
 
     pj_strdup2(pool, &name_addr->display, "User\\\\");
+    pj_strdup2(pool, &url->host, "localhost");
+    return (pjsip_uri*)name_addr;
+}
+
+/* "\"\\\"User\\\"\" <sip:localhost>" */
+static pjsip_uri *create_uri40(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;