* [Qemu-devel] [PATCH] hw/fmopl: Fix buffer access out-of-bounds errors
@ 2011-01-15 16:59 Stefan Weil
2011-03-12 16:43 ` [Qemu-devel] [PATCH RESEND] " Stefan Weil
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Weil @ 2011-01-15 16:59 UTC (permalink / raw)
To: QEMU Developers; +Cc: Blue Swirl
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>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
hw/fmopl.c | 6 +++++-
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];
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PATCH RESEND] hw/fmopl: Fix buffer access out-of-bounds errors
2011-01-15 16:59 [Qemu-devel] [PATCH] hw/fmopl: Fix buffer access out-of-bounds errors Stefan Weil
@ 2011-03-12 16:43 ` Stefan Weil
2011-03-13 13:37 ` [Qemu-devel] " Blue Swirl
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Weil @ 2011-03-12 16:43 UTC (permalink / raw)
To: qemu-devel; +Cc: Blue Swirl
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>
---
hw/fmopl.c | 6 +++++-
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];
--
1.7.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] Re: [PATCH RESEND] hw/fmopl: Fix buffer access out-of-bounds errors
2011-03-12 16:43 ` [Qemu-devel] [PATCH RESEND] " Stefan Weil
@ 2011-03-13 13:37 ` Blue Swirl
0 siblings, 0 replies; 3+ messages in thread
From: Blue Swirl @ 2011-03-13 13:37 UTC (permalink / raw)
To: Stefan Weil; +Cc: qemu-devel
Thanks, applied.
On Sat, Mar 12, 2011 at 6:43 PM, Stefan Weil <weil@mail.berlios.de> wrote:
> 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>
> ---
> hw/fmopl.c | 6 +++++-
> 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];
> --
> 1.7.2.3
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-13 13:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-15 16:59 [Qemu-devel] [PATCH] hw/fmopl: Fix buffer access out-of-bounds errors Stefan Weil
2011-03-12 16:43 ` [Qemu-devel] [PATCH RESEND] " Stefan Weil
2011-03-13 13:37 ` [Qemu-devel] " Blue Swirl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).