From owner-svn-src-all@freebsd.org Sat Apr 29 06:41:53 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41139D5485B; Sat, 29 Apr 2017 06:41:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0DAD316AC; Sat, 29 Apr 2017 06:41:52 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3T6fqER098183; Sat, 29 Apr 2017 06:41:52 GMT (envelope-from pfg@FreeBSD.org) Received: (from pfg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3T6fpge098182; Sat, 29 Apr 2017 06:41:51 GMT (envelope-from pfg@FreeBSD.org) Message-Id: <201704290641.v3T6fpge098182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org using -f From: "Pedro F. Giffuni" Date: Sat, 29 Apr 2017 06:41:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r317583 - in head: sys/dev/sound/pcm usr.bin/unexpand X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Apr 2017 06:41:53 -0000 Author: pfg Date: Sat Apr 29 06:41:51 2017 New Revision: 317583 URL: https://svnweb.freebsd.org/changeset/base/317583 Log: Fix some cases where an index was used before its limits check. Obtained from: DragonFlyBSD (git 799ba435) MFC after: 5 days Modified: head/sys/dev/sound/pcm/feeder_matrix.c head/usr.bin/unexpand/unexpand.c Modified: head/sys/dev/sound/pcm/feeder_matrix.c ============================================================================== --- head/sys/dev/sound/pcm/feeder_matrix.c Sat Apr 29 06:33:37 2017 (r317582) +++ head/sys/dev/sound/pcm/feeder_matrix.c Sat Apr 29 06:41:51 2017 (r317583) @@ -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: head/usr.bin/unexpand/unexpand.c ============================================================================== --- head/usr.bin/unexpand/unexpand.c Sat Apr 29 06:33:37 2017 (r317582) +++ head/usr.bin/unexpand/unexpand.c Sat Apr 29 06:41:51 2017 (r317583) @@ -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');