Author: pfg
Date: Thu May  4 14:50:25 2017
New Revision: 317794
URL: https://svnweb.freebsd.org/changeset/base/317794

Log:
  MFC r317583:
  Fix some cases where an index was used before its limits check.
  
  Obtained from:        DragonFlyBSD (git 799ba435)

Modified:
  stable/10/sys/dev/sound/pcm/feeder_matrix.c
  stable/10/usr.bin/unexpand/unexpand.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sound/pcm/feeder_matrix.c
==============================================================================
--- stable/10/sys/dev/sound/pcm/feeder_matrix.c Thu May  4 14:48:57 2017        
(r317793)
+++ stable/10/sys/dev/sound/pcm/feeder_matrix.c Thu May  4 14:50:25 2017        
(r317794)
@@ -750,8 +750,8 @@ feeder_matrix_oss_get_channel_order(stru
 
        tmpmap = 0x0000000000000000ULL;
 
-       for (i = 0; m->map[i].type != SND_CHN_T_MAX &&
-           i < SND_CHN_OSS_MAX; i++) {
+       for (i = 0; i < SND_CHN_OSS_MAX && m->map[i].type != SND_CHN_T_MAX;
+           i++) {
                if ((1 << m->map[i].type) & ~SND_CHN_OSS_VALIDMASK)
                        return (EINVAL);
                tmpmap |=

Modified: stable/10/usr.bin/unexpand/unexpand.c
==============================================================================
--- stable/10/usr.bin/unexpand/unexpand.c       Thu May  4 14:48:57 2017        
(r317793)
+++ stable/10/usr.bin/unexpand/unexpand.c       Thu May  4 14:50:25 2017        
(r317794)
@@ -132,8 +132,8 @@ tabify(const char *curfile)
                                    tabstops[0];
                                continue;
                        } else {
-                               for (n = 0; tabstops[n] - 1 < dcol &&
-                                   n < nstops; n++)
+                               for (n = 0; n < nstops &&
+                                   tabstops[n] - 1 < dcol; n++)
                                        ;
                                if (n < nstops - 1 && tabstops[n] - 1 < limit) {
                                        dcol = tabstops[n];
@@ -154,7 +154,7 @@ tabify(const char *curfile)
                                    tabstops[0];
                        }
                } else {
-                       for (n = 0; tabstops[n] - 1 < ocol && n < nstops; n++)
+                       for (n = 0; n < nstops && tabstops[n] - 1 < ocol; n++)
                                ;
                        while (ocol < dcol && n < nstops && ocol < limit) {
                                putwchar('\t');
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to