RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: more checks

Browse source
This commit is contained in:
iceman1001 2019-02-24 23:54:36 +01:00
parent 142b3d8de5
commit 2b9eb401fa
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
client/loclass/fileutils.c
View file

@ -323,6 +323,7 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
if ( preferredName == NULL ) return 1; if ( preferredName == NULL ) return 1;
if ( suffix == NULL ) return 1; if ( suffix == NULL ) return 1;
if ( data == NULL ) return 1;
size_t counter = 0; size_t counter = 0;
int retval = 0, hexlen = 0; int retval = 0, hexlen = 0;
@ -364,7 +365,9 @@ int loadFileEML(const char *preferredName, const char *suffix, void* data, size_
} }
fclose(f); fclose(f);
PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName); PrintAndLogDevice(SUCCESS, "loaded %d bytes from text file " _YELLOW_(%s), counter, fileName);
*datalen = counter;
if ( datalen )
*datalen = counter;
out: out:
free(fileName); free(fileName);
@ -372,12 +375,14 @@ out:
} }
int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) { int loadFileJSON(const char *preferredName, const char *suffix, void* data, size_t maxdatalen, size_t* datalen) {
*datalen = 0;
json_t *root;
json_error_t error;
if ( preferredName == NULL ) return 1; if ( preferredName == NULL ) return 1;
if ( suffix == NULL ) return 1; if ( suffix == NULL ) return 1;
if ( data == NULL ) return 1;
*datalen = 0;
json_t *root;
json_error_t error;
int retval = 0; int retval = 0;
int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10); int size = sizeof(char) * (strlen(preferredName) + strlen(suffix) + 10);
@ -461,6 +466,7 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
if ( preferredName == NULL ) return 1; if ( preferredName == NULL ) return 1;
if ( suffix == NULL ) return 1; if ( suffix == NULL ) return 1;
if ( data == NULL ) return 1;
// t5577 == 4bytes // t5577 == 4bytes
// mifare == 6 bytes // mifare == 6 bytes
@ -516,8 +522,10 @@ int loadFileDICTIONARY(const char *preferredName, const char *suffix, void* data
counter += (keylen >> 1); counter += (keylen >> 1);
} }
fclose(f); fclose(f);
PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName); PrintAndLogDevice(SUCCESS, "loaded " _GREEN_(%2d) "keys from dictionary file " _YELLOW_(%s), *keycnt, fileName);
*datalen = counter;
if ( datalen )
*datalen = counter;
out: out:
free(fileName); free(fileName);
return retval; return retval;