Changeset 4288

Timestamp:

Oct 26, 2012 9:30:37 AM (12 years ago)

Author:

bennylp

Message:

Misc (re #1559): Require name-addr to have the quote if display name is given. Previously an URI like this will be accepted: "301 301" sip:301@host

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (2 diffs)
• src/pjsip/sip_parser.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -2730 +2730 @@
     /** 
      * The full SIP URL for the account. The value can take name address or 
-     * URL format, and will look something like "sip:account@serviceprovider".
+     * URL format, and will look something like "sip:account@serviceprovider"
+     * or "\"Display Name\" <sip:account@provider>".
      *
      * This field is mandatory.
@@ -4535 +4536 @@
  *
  * @param call_id       The call id to be transfered.
- * @param dest          Address of new target to be contacted.
+ * @param dest          URI of new target to be contacted. The URI may be
+ *                      in name address or addr-spec format.
  * @param msg_data      Optional message components to be sent with
  *                      the request.

pjproject/trunk/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) {