From 127f5ed1929fe44bf6b7f21120d4fd35b94f9763 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Mon, 22 Apr 2019 22:11:57 +0200
Subject: [PATCH 1/2] Revert c7a4d7af, remove redundant include
---
armsrc/Standalone/hf_colin.h | 1 -
armsrc/Standalone/hf_mattyrun.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/armsrc/Standalone/hf_colin.h b/armsrc/Standalone/hf_colin.h
index c8f2ab8ed..251620626 100644
--- a/armsrc/Standalone/hf_colin.h
+++ b/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"
diff --git a/armsrc/Standalone/hf_mattyrun.h b/armsrc/Standalone/hf_mattyrun.h
index 687979162..c37624821 100644
--- a/armsrc/Standalone/hf_mattyrun.h
+++ b/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
From 25048ccf2ffcd5faee018e2157c91f11f8fe74b9 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 24 Apr 2019 00:53:25 +0200
Subject: [PATCH 2/2] Fix segfault when loading a file
---
client/loclass/fileutils.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/client/loclass/fileutils.c b/client/loclass/fileutils.c
index 72d3e26af..e01d04e33 100644
--- a/client/loclass/fileutils.c
+++ b/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;
}