Changeset 5259 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_common.c

Timestamp:

Mar 14, 2016 6:40:45 AM (9 years ago)

Author:

nanang

Message:

Misc (re #1882): Fixed crash due to insufficient buffer in printing video device capabilities and formats in pjsua app.

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app_common.c (modified) (4 diffs)

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

@@ -271 +271 @@
 {
     char capnames[120];
-    char formats[120];
+    char formats[200];
     const char *dirname;
     unsigned i;
+    int st_len;
 
     if (vdi->dir == PJMEDIA_DIR_CAPTURE_RENDER) {
@@ -285 +286 @@
 
     capnames[0] = '\0';
+    st_len = 0;
     for (i=0; i<sizeof(int)*8 && (1 << i) < PJMEDIA_VID_DEV_CAP_MAX; ++i) {
         if (vdi->caps & (1 << i)) {
             const char *capname = pjmedia_vid_dev_cap_name(1 << i, NULL);
             if (capname) {
+                int tmp_len = strlen(capname);
+                if ((int)sizeof(capnames) - st_len <= tmp_len)
+                    break;
+
+                st_len += (tmp_len + 2);
                 if (*capnames)
                     strcat(capnames, ", ");
-                strncat(capnames, capname,
-                        sizeof(capnames)-strlen(capnames)-1);
+                strcat(capnames, capname);
             }
         }
@@ -298 +304 @@
 
     formats[0] = '\0';
+    st_len = 0;
     for (i=0; i<vdi->fmt_cnt; ++i) {
         const pjmedia_video_format_info *vfi =
                 pjmedia_get_video_format_info(NULL, vdi->fmt[i].id);
         if (vfi) {
+            int tmp_len = strlen(vfi->name);
+            if ((int)sizeof(formats) - st_len <= tmp_len) {
+                st_len = -1;
+                break;
+            }
+
+            st_len += (tmp_len + 2);
             if (*formats)
                 strcat(formats, ", ");
-            strncat(formats, vfi->name, sizeof(formats)-strlen(formats)-1);
+            strcat(formats, vfi->name);
         }
     }
@@ -311 +325 @@
               dirname, title));
     PJ_LOG(3,(THIS_FILE, "    Supported capabilities: %s", capnames));
-    PJ_LOG(3,(THIS_FILE, "    Supported formats: %s", formats));
+    PJ_LOG(3,(THIS_FILE, "    Supported formats: %s%s", formats,
+                              (st_len<0? " ..." : "")));
 }