RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-20 03:48:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into experimental_varlen

Browse source 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
This commit is contained in:
Philippe Teuwen 2019-04-24 00:59:57 +02:00
commit 79d7fb65b5
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
armsrc/Standalone/hf_colin.h
View file

@ -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"

1
armsrc/Standalone/hf_mattyrun.h
View file

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

4
client/loclass/fileutils.c
View file

@ -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;
}