Changeset 3742 for pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Sep 7, 2011 11:28:45 AM (13 years ago)

Author:

bennylp

Message:

Always enclose Contact URI with double quote to prevent invalid Contact URI if the display part of the AOR contains reserved characters. This fixes #1363

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (2 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_acc.c

@@ -2473 +2473 @@
     contact->ptr = (char*)pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
-                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s%s>%.*s",
+                                     "%s%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s%s>%.*s",
+                                     (acc->display.slen?"\"" : ""),
                                      (int)acc->display.slen,
                                      acc->display.ptr,
-                                     (acc->display.slen?" " : ""),
+                                     (acc->display.slen?"\" " : ""),
                                      (secure ? PJSUA_SECURE_SCHEME : "sip"),
                                      (int)acc->user_part.slen,
@@ -2631 +2632 @@
     contact->ptr = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE);
     contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE,
-                                     "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s",
+                                     "%s%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>%.*s",
+                                     (acc->display.slen?"\"" : ""),
                                      (int)acc->display.slen,
                                      acc->display.ptr,
-                                     (acc->display.slen?" " : ""),
+                                     (acc->display.slen?"\" " : ""),
                                      (secure ? PJSUA_SECURE_SCHEME : "sip"),
                                      (int)acc->user_part.slen,