From: Sascha Wildner <saw@online.de>
Date: Sat, 30 Jun 2012 08:44:33 +0000 (+0200)
Subject: Fix more wrong sizeof() usages, part 4/x
X-Git-Tag: v3.2.0~738
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/5406684d1fb88a44f3c4843fd70494e58b3cd431

Fix more wrong sizeof() usages, part 4/x

We want struct sizes here, not pointer sizes.

Found-with: Coccinelle (http://coccinelle.lip6.fr/)
---

diff --git a/contrib/hostapd/src/crypto/md5.c b/contrib/hostapd/src/crypto/md5.c
index a7db7aa9a7..e13ce7d497 100644
--- a/contrib/hostapd/src/crypto/md5.c
+++ b/contrib/hostapd/src/crypto/md5.c
@@ -287,7 +287,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (u32 *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     os_memcpy(digest, ctx->buf, 16);
-    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
diff --git a/contrib/hostapd/src/drivers/driver_ralink.c b/contrib/hostapd/src/drivers/driver_ralink.c
index e9313cb33e..e14e70b89a 100644
--- a/contrib/hostapd/src/drivers/driver_ralink.c
+++ b/contrib/hostapd/src/drivers/driver_ralink.c
@@ -232,7 +232,7 @@ static int wpa_driver_ralink_set_ssid(struct wpa_driver_ralink_data *drv,
 	buf = os_zalloc(sizeof(NDIS_802_11_SSID));
 	if (buf == NULL)
 		return -1;
-	os_memset(buf, 0, sizeof(buf));
+	os_memset(buf, 0, sizeof(*buf));
 	buf->SsidLength = ssid_len;
 	os_memcpy(buf->Ssid, ssid, ssid_len);
 	os_memset(&iwr, 0, sizeof(iwr));
diff --git a/contrib/wpa_supplicant/src/crypto/md5.c b/contrib/wpa_supplicant/src/crypto/md5.c
index a7db7aa9a7..e13ce7d497 100644
--- a/contrib/wpa_supplicant/src/crypto/md5.c
+++ b/contrib/wpa_supplicant/src/crypto/md5.c
@@ -287,7 +287,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (u32 *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     os_memcpy(digest, ctx->buf, 16);
-    os_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    os_memset(ctx, 0, sizeof(*ctx));	/* In case it's sensitive */
 }
 
 /* The four core functions - F1 is optimized somewhat */
diff --git a/contrib/wpa_supplicant/src/drivers/driver_ralink.c b/contrib/wpa_supplicant/src/drivers/driver_ralink.c
index e9313cb33e..e14e70b89a 100644
--- a/contrib/wpa_supplicant/src/drivers/driver_ralink.c
+++ b/contrib/wpa_supplicant/src/drivers/driver_ralink.c
@@ -232,7 +232,7 @@ static int wpa_driver_ralink_set_ssid(struct wpa_driver_ralink_data *drv,
 	buf = os_zalloc(sizeof(NDIS_802_11_SSID));
 	if (buf == NULL)
 		return -1;
-	os_memset(buf, 0, sizeof(buf));
+	os_memset(buf, 0, sizeof(*buf));
 	buf->SsidLength = ssid_len;
 	os_memcpy(buf->Ssid, ssid, ssid_len);
 	os_memset(&iwr, 0, sizeof(iwr));