Changeset 6041 for pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

Timestamp:

Jul 19, 2019 9:05:23 AM (5 years ago)

Author:

riza

Message:

Re #2210 (misc): Prevent overflow when searching for the closest video format.

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_port.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -351 +351 @@
         if (diff_width1 <= diff_width2) {
             int k = 1;
-            pjmedia_rect_size tmp_size = vfd->size;         
-
-            while(((GET_DIFF(tmp_size.w, req_fmt_size->w) <
-                   (GET_DIFF(nearest_width[k].w, req_fmt_size->w))) && 
-                  (k < PJ_ARRAY_SIZE(nearest_width))))          
+            pjmedia_rect_size tmp_size = vfd->size;
+
+            while(((k < PJ_ARRAY_SIZE(nearest_width)) &&
+                   (GET_DIFF(tmp_size.w, req_fmt_size->w) <
+                   (GET_DIFF(nearest_width[k].w, req_fmt_size->w)))))
             {
                 nearest_width[k-1] = nearest_width[k];
@@ -361 +361 @@
             }
             nearest_width[k-1] = tmp_size;
-        }               
+        }
     }
     /* No need to calculate ratio if exact match is found. */