Changeset 587 for pjproject/trunk

Timestamp:

Jul 5, 2006 9:42:45 PM (18 years ago)

Author:

bennylp

Message:

Fixed SIP parsing bugs when in-place escaping is enabled

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip/sip_parser.c (modified) (2 diffs)
• test-pjsip/uri_test.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_parser.c

@@ -363 +363 @@
     status = pj_cis_dup(&pjsip_PASSWD_SPEC_ESC, &pjsip_PASSWD_SPEC);
     PJ_ASSERT_RETURN(status == PJ_SUCCESS, status);
-    pj_cis_del_str( &pjsip_PASSWD_SPEC, ESCAPED);
+    pj_cis_del_str( &pjsip_PASSWD_SPEC_ESC, ESCAPED);
 
     status = pj_cis_init(&cis_buf, &pjsip_PROBE_USER_HOST_SPEC);
@@ -1105 +1105 @@
         {
             parser_get_and_unescape(scanner, pool, &pjsip_HDR_CHAR_SPEC,
-                                    &pjsip_HDR_CHAR_SPEC, hvalue);
+                                    &pjsip_HDR_CHAR_SPEC_ESC, hvalue);
         }
     }

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

@@ -686 +686 @@
     pj_status_t status;
     int len;
+    char *input;
     pjsip_uri *parsed_uri, *ref_uri;
     pj_str_t s1 = {NULL, 0}, s2 = {NULL, 0};
     pj_timestamp t1, t2;
 
-    entry->len = pj_native_strlen(entry->str);
+    if (entry->len == 0)
+        entry->len = pj_native_strlen(entry->str);
+
+#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0
+    input = pj_pool_alloc(pool, entry->len + 1);
+    pj_memcpy(input, entry->str, entry->len);
+    input[entry->len] = '\0';
+#else
+    input = entry->str;
+#endif
 
     /* Parse URI text. */
     pj_get_timestamp(&t1);
     var.parse_len = var.parse_len + entry->len;
-    parsed_uri = pjsip_parse_uri(pool, entry->str, entry->len, 0);
+    parsed_uri = pjsip_parse_uri(pool, input, entry->len, 0);
     if (!parsed_uri) {
         /* Parsing failed. If the entry says that this is expected, then
@@ -704 +714 @@
             PJ_LOG(3,(THIS_FILE, "   uri parse error!\n"
                                  "   uri='%s'\n",
-                                 entry->str));
+                                 input));
         }
         goto on_return;