Changeset 2566 for pjproject/trunk

Timestamp:

Apr 2, 2009 12:15:23 PM (16 years ago)

Author:

bennylp

Message:

Misc (ticket #772): bug in pjsua application when reading the URL from the buddy list, causing corrupt/invalid URI to be returned

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3132 +3132 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
                 }
 
             } else if (result.uri_result) {
-                uri = result.uri_result;
+                tmp = pj_str(result.uri_result);
+            } else {
+                tmp.slen = 0;
             }
             
-            tmp = pj_str(uri);
             pjsua_call_make_call( current_acc, &tmp, 0, NULL, NULL, NULL);
             break;
@@ -3163 +3165 @@
                 }
                 pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                uri = binfo.uri.ptr;
+                tmp.ptr = buf;
+                pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
             } else {
-                uri =  result.uri_result;
+                tmp = pj_str(result.uri_result);
             }
 
@@ -3171 +3174 @@
                 pj_status_t status;
             
-                tmp = pj_str(uri);
                 status = pjsua_call_make_call(current_acc, &tmp, 0, NULL,
                                               NULL, NULL);
@@ -3209 +3211 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+                    uri = buf;
                 }
 
@@ -3766 +3770 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+                    uri = buf;
                 }