diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index dc2dee7b7..e78c07c76 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -1336,7 +1336,7 @@ int CmdHF14AMfNestedHard(const char *Cmd) {
     uint8_t key[6] = {0, 0, 0, 0, 0, 0};
     uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};
     uint8_t cmdp = 0;
-    char filename[FILE_PATH_SIZE], *fptr;
+    char filename[FILE_PATH_SIZE] = {0}, *fptr;
     char szTemp[FILE_PATH_SIZE - 20];
     char ctmp;
 
diff --git a/client/crypto/asn1dump.c b/client/crypto/asn1dump.c
index a4b491a84..8453d0f13 100644
--- a/client/crypto/asn1dump.c
+++ b/client/crypto/asn1dump.c
@@ -238,7 +238,7 @@ static char *asn1_oid_description(const char *oid, bool with_group_desc) {
     memset(res, 0x00, sizeof(res));
 
     size_t len = strlen(get_my_executable_directory());
-    if (len > 300) len = 299;
+    if (len >= 300) len = 299;
 
     strncpy(fname, get_my_executable_directory(), len);
     strcat(fname, "crypto/oids.json");