Fix sizeof() checks found by coverity

diff --git a/src/main/realms.c b/src/main/realms.c
index a4b3a7fd653bb40305374e8c59a4acaa99b4f8b6..e61b681be8f3f5e9abbf0912ce34a2b505c245ec 100644 (file)
--- a/src/main/realms.c
+++ b/src/main/realms.c
@@ -1081,7 +1081,7 @@ static int server_pool_add(realm_config_t *rc,
 
                value = cf_pair_value(cp);
 
-               memset(&myhome, 0, sizeof(&myhome));
+               memset(&myhome, 0, sizeof(myhome));
                myhome.name = value;
                myhome.type = server_type;
 

diff --git a/src/modules/rlm_otp/otp_radstate.c b/src/modules/rlm_otp/otp_radstate.c
index b896413d10d80cbe1fb2b2ba72e4780089ef391d..9e60f0024bd6d025435cf8492802d9cf7d4accea 100644 (file)
--- a/src/modules/rlm_otp/otp_radstate.c
+++ b/src/modules/rlm_otp/otp_radstate.c
@@ -97,7 +97,7 @@ otp_gen_state(char rad_state[OTP_MAX_RADSTATE_LEN],
    * DES, so we'll use it's hmac functionality also -- saves us from
    * having to collect the data to be signed into one contiguous piece.
    */
-  HMAC_Init(&hmac_ctx, key, sizeof(key), EVP_md5());
+  HMAC_Init(&hmac_ctx, key, sizeof(key[0] * 16), EVP_md5());
   HMAC_Update(&hmac_ctx, challenge, clen);
   HMAC_Update(&hmac_ctx, (unsigned char *) &flags, 4);
   HMAC_Update(&hmac_ctx, (unsigned char *) &when, 4);

diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 8acb1f09d3f1ea36a5a92a3e821b3d8ef3c26f7b..c00e31c64e8d418a139fd87f4f05b4f6162e75de 100644 (file)
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -417,8 +417,8 @@ static int perl_instantiate(CONF_SECTION *conf, void **instance)
        const char *xlat_name;
        int exitstatus = 0, argc=0;
 
-        embed = rad_malloc(4*(sizeof(char *)));
-        memset(embed, 0, sizeof(4*(sizeof(char *))));
+        embed = rad_malloc(4 * sizeof(char *));
+        memset(embed, 0, 4 *sizeof(char *));
        /*
         *      Set up a storage area for instance data
         */