d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some cases where an index was used before its limits check.

Browse Source 
Obtained from:	DragonFlyBSD (git 799ba435)
MFC after:	5 days
This commit is contained in:
Pedro F. Giffuni 2017-04-29 06:41:51 +00:00
parent 5b6bb1668e
commit 336c5fb5cd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/sound/pcm/feeder_matrix.c
View File

@ -750,8 +750,8 @@ feeder_matrix_oss_get_channel_order(struct pcmchan_matrix *m,
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 |=

6
usr.bin/unexpand/unexpand.c
View File

@ -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');