github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix some coverity

Browse source
This commit is contained in:
iceman1001 2023-10-02 21:47:35 +02:00
commit dee03b414c
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdhf15.c
View file

@ -1706,9 +1706,9 @@ static int CmdHF15Dump(const char *Cmd) {
} }
if (blklen == 8) { if (blklen == 8) {
pm3_save_dump(filename, data, (blocknum * blklen), jsf15_v3); pm3_save_dump(filename, data, (size_t)(blocknum * blklen), jsf15_v3);
} else { } else {
pm3_save_dump(filename, data, (blocknum * blklen), jsf15_v2); pm3_save_dump(filename, data, (size_t)(blocknum * blklen), jsf15_v2);
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }

12
client/src/fileutils.c
View file

@ -1064,8 +1064,9 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
json_error_t error; json_error_t error;
json_t *root = json_load_file(path, 0, &error); json_t *root = json_load_file(path, 0, &error);
if (verbose) if (verbose) {
PrintAndLogEx(SUCCESS, "loaded from JSON file `" _YELLOW_("%s") "`", path); PrintAndLogEx(SUCCESS, "loaded from JSON file `" _YELLOW_("%s") "`", path);
}
free(path); free(path);
@ -1521,14 +1522,9 @@ int loadFileJSONex(const char *preferredName, void *data, size_t maxdatalen, siz
goto out; goto out;
} }
// unidentified file format
if (verbose) {
PrintAndLogEx(FAILED, "Unidentified file format `" _YELLOW_("%s") "`", path);
}
retval = PM3_EFILE;
out: out:
if (callback != NULL) { if (callback != NULL) {
(*callback)(root); (*callback)(root);
} }
@ -2274,7 +2270,7 @@ int pm3_load_dump(const char *fn, void **pdump, size_t *dumplen, size_t maxdumpl
DumpFileType_t dftype = getfiletype(fn); DumpFileType_t dftype = getfiletype(fn);
switch (dftype) { switch (dftype) {
case BIN: { case BIN: {
loadFile_safe(fn, ".bin", pdump, dumplen); res = loadFile_safe(fn, ".bin", pdump, dumplen);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(WARNING, "File IO failed"); PrintAndLogEx(WARNING, "File IO failed");
} }