[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-5.0 10/11] hw/timer/pxa2xx_timer: Add assertion to silent sta
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-5.0 10/11] hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning |
Date: |
Sat, 21 Mar 2020 12:46:14 +0100 |
pxa2xx_timer_tick4() takes an opaque pointer, then calls
pxa2xx_timer_update4(), so the static analyzer can not
verify that the 'n < 8':
425 static void pxa2xx_timer_tick4(void *opaque)
426 {
427 PXA2xxTimer4 *t = (PXA2xxTimer4 *) opaque;
428 PXA2xxTimerInfo *i = (PXA2xxTimerInfo *) t->tm.info;
429
430 pxa2xx_timer_tick(&t->tm);
433 if (t->control & (1 << 6))
434 pxa2xx_timer_update4(i, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL),
t->tm.num - 4);
135 static void pxa2xx_timer_update4(void *opaque, uint64_t now_qemu, int n)
136 {
137 PXA2xxTimerInfo *s = (PXA2xxTimerInfo *) opaque;
140 static const int counters[8] = { 0, 0, 0, 0, 4, 4, 6, 6 };
142
143 if (s->tm4[n].control & (1 << 7))
144 counter = n;
145 else
146 counter = counters[n];
Add an assert() to give the static analyzer a hint, this fixes a
warning reported by Clang static code analyzer:
CC hw/timer/pxa2xx_timer.o
hw/timer/pxa2xx_timer.c:146:17: warning: Assigned value is garbage or
undefined
counter = counters[n];
^ ~~~~~~~~~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/timer/pxa2xx_timer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index cd172cc1e9..944c165889 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -140,6 +140,7 @@ static void pxa2xx_timer_update4(void *opaque, uint64_t
now_qemu, int n)
static const int counters[8] = { 0, 0, 0, 0, 4, 4, 6, 6 };
int counter;
+ assert(n < ARRAY_SIZE(counters));
if (s->tm4[n].control & (1 << 7))
counter = n;
else
--
2.21.1
[PATCH-for-5.0 06/11] hw/isa/i82378: Remove dead assignment, Philippe Mathieu-Daudé, 2020/03/21
[PATCH-for-5.0 07/11] hw/gpio/aspeed_gpio: Remove dead assignment, Philippe Mathieu-Daudé, 2020/03/21
[PATCH-for-5.0 08/11] hw/timer/exynos4210_mct: Remove dead assignments, Philippe Mathieu-Daudé, 2020/03/21
[PATCH-for-5.0 09/11] hw/timer/stm32f2xx_timer: Remove dead assignment, Philippe Mathieu-Daudé, 2020/03/21
[PATCH-for-5.0 10/11] hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning,
Philippe Mathieu-Daudé <=
[PATCH-for-5.0 11/11] hw/scsi/esp-pci: Remove dead assignment, Philippe Mathieu-Daudé, 2020/03/21
Re: [PATCH-for-5.0 00/11] misc: Trivial static code analyzer fixes, Aleksandar Markovic, 2020/03/21