diff --git a/src/folder.c b/src/folder.c
index 02b782fda..6b2b636d1 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -154,7 +154,7 @@ char *first_file_in_directory (const char *path)
 
     #endif
 
-      if ((strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0)) continue;
+      if ((strncmp (de->d_name, ".", strlen (de->d_name)) == 0) || (strncmp (de->d_name, "..", strlen (de->d_name)) == 0)) continue;
 
       first_file = strdup (de->d_name);
 
@@ -217,7 +217,7 @@ char **scan_directory (const char *path)
 
     #endif
 
-      if ((strcmp (de->d_name, ".") == 0) || (strcmp (de->d_name, "..") == 0)) continue;
+      if ((strncmp (de->d_name, ".", strlen (de->d_name)) == 0) || (strncmp (de->d_name, "..", strlen (de->d_name)) == 0)) continue;
 
       char *path_file = (char *) hcmalloc (HCBUFSIZ_TINY);
 
diff --git a/src/interface.c b/src/interface.c
index 3dfcf9ad0..c69e996c2 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -10568,7 +10568,7 @@ int sip_auth_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_U
 
   // there are 2 possibilities for the esalt:
 
-  if ((strcmp ((const char *) qop_pos, "auth") == 0) || (strcmp ((const char *) qop_pos, "auth-int") == 0))
+  if ((strncmp ((const char *) qop_pos, "auth", strlen ((const char *) qop_pos)) == 0) || (strncmp ((const char *) qop_pos, "auth-int", strlen ((const char *) qop_pos)) == 0))
   {
     esalt_len = 1 + nonce_len + 1 + nonce_count_len + 1 + nonce_client_len + 1 + qop_len + 1 + 32;