aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-03-12 17:43:56 +0100
committerBlue Swirl <blauwirbel@gmail.com>2011-03-13 13:35:21 +0000
commit913895ab96507db2bc448d3ae72a409407172d2e (patch)
tree1b9e950cfb1d73c7d81cbe08fcd780b4276b7345
parent7165448a913bd8f757f588e8f1581c170d8b1775 (diff)
downloadqemu-913895ab96507db2bc448d3ae72a409407172d2e.zip
qemu-913895ab96507db2bc448d3ae72a409407172d2e.tar.gz
qemu-913895ab96507db2bc448d3ae72a409407172d2e.tar.bz2
hw/fmopl: Fix buffer access out-of-bounds errors
Index 75 is one too large for AR_TABLE[75], DR_TABLE[75]. This error was reported by cppcheck. hw/fmopl.c:600: error: Buffer access out-of-bounds: OPL.AR_TABLE hw/fmopl.c:601: error: Buffer access out-of-bounds: OPL.DR_TABLE Fix this by limiting the access to the allowed range. MultiArcadeMachineEmulator has newer versions of fmopl, but using these requires more efforts. Cc: Blue Swirl <blauwirbel@gmail.com> Reviewed-by: malc <av1474@comtv.ru> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--hw/fmopl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/fmopl.c b/hw/fmopl.c
index 3df1806..d8a0f36 100644
--- a/hw/fmopl.c
+++ b/hw/fmopl.c
@@ -45,6 +45,10 @@
#define PI 3.14159265358979323846
#endif
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#endif
+
/* -------------------- for debug --------------------- */
/* #define OPL_OUTPUT_LOG */
#ifdef OPL_OUTPUT_LOG
@@ -595,7 +599,7 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE )
OPL->AR_TABLE[i] = rate / ARRATE;
OPL->DR_TABLE[i] = rate / DRRATE;
}
- for (i = 60;i < 76;i++)
+ for (i = 60; i < ARRAY_SIZE(OPL->AR_TABLE); i++)
{
OPL->AR_TABLE[i] = EG_AED-1;
OPL->DR_TABLE[i] = OPL->DR_TABLE[60];