Module Name: src
Committed By: nat
Date: Mon Mar 20 22:42:39 UTC 2017
Modified Files:
src/sys/dev: audio.c
Log Message:
Adjust array bounds depending on type in macros for mix/saturate/recswvol.
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/audio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.315 src/sys/dev/audio.c:1.316
--- src/sys/dev/audio.c:1.315 Thu Mar 16 00:21:30 2017
+++ src/sys/dev/audio.c Mon Mar 20 22:42:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.315 2017/03/16 00:21:30 maya Exp $ */
+/* $NetBSD: audio.c,v 1.316 2017/03/20 22:42:39 nat Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.315 2017/03/16 00:21:30 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.316 2017/03/20 22:42:39 nat Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -5541,7 +5541,7 @@ mix_write(void *arg)
if (cc > cc2) \
cc = cc2; \
\
- for (m = 0; m < cc / 2; m++) { \
+ for (m = 0; m < (cc / (name / 8)); m++) { \
orig[m] += (type)((int32_t)(tomix[m] * \
(vc->sc_swvol + 1)) / (sc->sc_opens * \
256)); \
@@ -5594,7 +5594,7 @@ mix_func(struct audio_softc *sc, struct
\
orig = (type *)(sc->sc_pr.s.inp); \
\
- for (m = 0; m < resid;m++) { \
+ for (m = 0; m < (resid / (name / 8));m++) { \
i = 0; \
if (&orig[m] >= (type *)sc->sc_pr.s.end) { \
orig = (type *)sc->sc_pr.s.start; \
@@ -5655,7 +5655,7 @@ saturate_func(struct audio_softc *sc)
if (cc > cc1) \
cc = cc1; \
\
- for (m = 0; m < cc; m++) { \
+ for (m = 0; m < (cc / (name / 8)); m++) { \
orig[m] = (bigger_type)(orig[m] * \
(bigger_type)(vc->sc_recswvol) / 256);\
} \
