Merge branch 'master' into experimental_varlen

* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include

armsrc/Standalone/hf_colin.h

@@ -19,7 +19,6 @@
 #include "proxmark3.h"
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
-#include "mifaresim.h"
 #include "iso14443a.h"
 #include "protocols.h"
 #include "util.h"

armsrc/Standalone/hf_mattyrun.h

@@ -17,7 +17,6 @@
 #include "usb_cmd.h"    // mifare1ksim flags
 #include "mifaresim.h"  // mifare1ksim
 #include "mifareutil.h"
-#include "mifaresim.h"
 
 #define OPTS 2
 

client/loclass/fileutils.c

@@ -313,8 +313,8 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t m
         goto out;
     }
 
-    if (bytes_read != maxdatalen) {
-        PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
+    if (bytes_read > maxdatalen) {
+        PrintAndLogDevice(WARNING, "Warning, bytes read exceed calling array limit. Max bytes is %d bytes", maxdatalen);
         bytes_read = maxdatalen;
     }