From: Florian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Date: Tue, 11 Aug 2009 14:29:28 +0000 (+0200)
Subject: madwifi plugin: Add some assertions …
X-Git-Tag: collectd-4.8.0~52
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d23ae38ad0863aca418e2003af0fcb7e4edc8f26;p=collectd.git

madwifi plugin: Add some assertions …

… to otherwise unchecked array indices.
---

diff --git a/src/madwifi.c b/src/madwifi.c
index 8538f685..9d973ec0 100644
--- a/src/madwifi.c
+++ b/src/madwifi.c
@@ -367,21 +367,29 @@ static int init_state = 0;
 
 static inline int item_watched(int i)
 {
+	assert (i >= 0);
+	assert (i < ((STATIC_ARRAY_SIZE (watch_items) + 1) * 32));
 	return watch_items[i / 32] & FLAG (i);
 }
 
 static inline int item_summed(int i)
 {
+	assert (i >= 0);
+	assert (i < ((STATIC_ARRAY_SIZE (misc_items) + 1) * 32));
 	return misc_items[i / 32] & FLAG (i);
 }
 
 static inline void watchlist_add (uint32_t *wl, int item)
 {
+	assert (item >= 0);
+	assert (item < ((WL_LEN + 1) * 32));
 	wl[item / 32] |= FLAG (item);
 }
 
 static inline void watchlist_remove (uint32_t *wl, int item)
 {
+	assert (item >= 0);
+	assert (item < ((WL_LEN + 1) * 32));
 	wl[item / 32] &= ~FLAG (item);
 }
 
@@ -609,6 +617,9 @@ process_stat_struct (int which, const void *ptr, const char *dev, const char *ma
 	uint32_t misc = 0;
 	int i;
 
+	assert (which >= 1);
+	assert (which < STATIC_ARRAY_SIZE (bounds));
+
 	for (i = bounds[which - 1]; i < bounds[which]; i++)
 	{
 		uint32_t val = *(uint32_t *)(((char *) ptr) + specs[i].offset) ;