dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chg: added limit check for loadfile

Browse Source 
rename: 'lf hitag checkchallenges'  ->  'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
This commit is contained in:
iceman1001
2019-03-14 08:24:49 +01:00
parent e4a9e348d6
commit 7d88c22aaf
5 changed files with 85 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/loclass/fileutils.c
View File

@@ -269,7 +269,7 @@ out:
return retval;
}
int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen) {
int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen) {
if (preferredName == NULL) return 1;
if (suffix == NULL) return 1;
@@ -313,6 +313,11 @@ int loadFile(const char *preferredName, const char *suffix, void *data, size_t *
retval = 3;
goto out;
}
if ( bytes_read != maxdatalen ) {
PrintAndLogDevice(WARNING, "Warning, bytes read exeed calling array limit. Max bytes is %d bytes", maxdatalen);
bytes_read = maxdatalen;
}
memcpy((data), dump, bytes_read);
free(dump);

3
client/loclass/fileutils.h
View File

@@ -112,10 +112,11 @@ extern int saveFileJSON(const char *preferredName, const char *suffix, JSONFileT
* @param preferredName
* @param suffix the file suffix. Leave out the ".".
* @param data The data array to store the loaded bytes from file
* @param maxdatalen the number of bytes that your data array has
* @param datalen the number of bytes loaded from file
* @return 0 for ok, 1 for failz
*/
extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t *datalen);
extern int loadFile(const char *preferredName, const char *suffix, void *data, size_t maxdatalen, size_t *datalen);
/**
* @brief Utility function to load data from a textfile (EML). This method takes a preferred name.