Changeset 4387 for pjproject/branches/1.x/pjsip/src/pjsip/sip_parser.c

Timestamp:

Feb 27, 2013 10:16:08 AM (10 years ago)

Author:

ming

Message:

Re #1559: Backported to 1.x, except r4312,r4330

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_parser.c (modified) (1 diff)

pjproject/branches/1.x/pjsip/src/pjsip/sip_parser.c

@@ -1523 +1523 @@
     /* Get the SIP-URL */
     has_bracket = (*scanner->curptr == '<');
-    if (has_bracket)
+    if (has_bracket) {
         pj_scan_get_char(scanner);
+    } else if (name_addr->display.slen) {
+        /* Must have bracket now (2012-10-26).
+         * Allowing (invalid) name-addr to pass URI verification will
+         * cause us to send invalid URI to the wire.
+         */
+        PJ_THROW( PJSIP_SYN_ERR_EXCEPTION);
+    }
     name_addr->uri = int_parse_uri( scanner, pool, PJ_TRUE );
     if (has_bracket) {