diff --git a/kadmin/random_password.c b/kadmin/random_password.c
index 93e5d761c..bf8bf8b3f 100644
--- a/kadmin/random_password.c
+++ b/kadmin/random_password.c
@@ -68,7 +68,8 @@ random_password(char *pw, size_t len)
 		      "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 2,
 		      "@$%&*()-+=:,/<>1234567890", 1);
     strlcpy(pw, pass, len);
-    memset_s(pass, sizeof(pass), 0, strlen(pass));
+    len = strlen(pass);
+    memset_s(pass, len, 0, len);
     free(pass);
 #endif
 }
diff --git a/lib/krb5/salt-des3.c b/lib/krb5/salt-des3.c
index c4d2d7556..8cb73cf46 100644
--- a/lib/krb5/salt-des3.c
+++ b/lib/krb5/salt-des3.c
@@ -91,7 +91,7 @@ DES3_string_to_key(krb5_context context,
     key->keytype = enctype;
     krb5_data_copy(&key->keyvalue, keys, sizeof(keys));
     memset_s(keys, sizeof(keys), 0, sizeof(keys));
-    memset_s(str, sizeof(str), 0, len);
+    memset_s(str, len, 0, len);
     free(str);
     return 0;
 }