Changeset 4322

Timestamp:

Jan 17, 2013 10:09:09 AM (12 years ago)

Author:

bennylp

Message:

Really fix #1609 after better understanding about the problem. This changeset:

• undo r4320
• remove the reliance on NULL termination in sip_auth_client.c
• add the NULL termination when printing tel: URI just in case other components use it

Location:

pjproject/trunk/pjsip/src/pjsip

Files:

• sip_auth_client.c (modified) (2 diffs)
• sip_tel_uri.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -921 +921 @@
          */
         unsigned i;
-        char *uri_str;
-        int len;
-
-        uri_str = (char*)pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE+1);
-        len = pjsip_uri_print(PJSIP_URI_IN_REQ_URI, tdata->msg->line.req.uri,
-                              uri_str, PJSIP_MAX_URL_SIZE);
-        if (len < 1 || len >= PJSIP_MAX_URL_SIZE)
+        pj_str_t uri;
+
+        uri.ptr = (char*)pj_pool_alloc(tdata->pool, PJSIP_MAX_URL_SIZE);
+        uri.slen = pjsip_uri_print(PJSIP_URI_IN_REQ_URI,
+                                   tdata->msg->line.req.uri,
+                                   uri.ptr, PJSIP_MAX_URL_SIZE);
+        if (uri.slen < 1 || uri.slen >= PJSIP_MAX_URL_SIZE)
             return PJSIP_EURITOOLONG;
-
-        /* https://trac.pjsip.org/repos/ticket/1609 */
-        uri_str[len] = '\0';
 
         for (i=0; i<sess->cred_cnt; ++i) {
@@ -950 +947 @@
                 pj_strdup(tdata->pool, &hs->credential.digest.realm,
                           &c->realm);
-                pj_strdup2(tdata->pool, &hs->credential.digest.uri,
-                           uri_str);
+                pj_strdup(tdata->pool, &hs->credential.digest.uri, &uri);
                 pj_strdup(tdata->pool, &hs->credential.digest.algorithm,
                           &sess->pref.algorithm);

pjproject/trunk/pjsip/src/pjsip/sip_tel_uri.c

@@ -183 +183 @@
     int printed;
     char *startbuf = buf;
-    char *endbuf = buf+size;
+    char *endbuf = buf+size-1;
     const pjsip_parser_const_t *pc = pjsip_parser_const();
 
@@ -217 +217 @@
         return -1;
     buf += printed;
+
+    *buf = '\0';
 
     return (buf-startbuf);