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

Resolve coverity 308206 and 308207

Browse Source
This commit is contained in:
Ave
2020-12-19 01:35:32 +03:00
parent 5a4e77d7af
commit 24b0e042cb
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/cmdhfemrtd.c
View File

@@ -1523,7 +1523,8 @@ static int cmd_hf_emrtd_dump(const char *Cmd) {
uint8_t dob[7] = { 0x00 }; uint8_t dob[7] = { 0x00 };
uint8_t expiry[7] = { 0x00 }; uint8_t expiry[7] = { 0x00 };
bool BAC = true; bool BAC = true;
int slen = 0; // unused bool error = false;
int slen = 0;
// Go through all args, if even one isn't supplied, mark BAC as unavailable // Go through all args, if even one isn't supplied, mark BAC as unavailable
if (CLIParamStrToBuf(arg_get_str(ctx, 1), docnum, 9, &slen) != 0 || slen == 0) { if (CLIParamStrToBuf(arg_get_str(ctx, 1), docnum, 9, &slen) != 0 || slen == 0) {
BAC = false; BAC = false;
@@ -1541,7 +1542,7 @@ static int cmd_hf_emrtd_dump(const char *Cmd) {
if (!validate_date(dob, slen)) { if (!validate_date(dob, slen)) {
PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue.");
PrintAndLogEx(HINT, "Use the format YYMMDD."); PrintAndLogEx(HINT, "Use the format YYMMDD.");
return PM3_ESOFT; error = true;
} }
} }
@@ -1551,11 +1552,14 @@ static int cmd_hf_emrtd_dump(const char *Cmd) {
if (!validate_date(expiry, slen)) { if (!validate_date(expiry, slen)) {
PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue.");
PrintAndLogEx(HINT, "Use the format YYMMDD."); PrintAndLogEx(HINT, "Use the format YYMMDD.");
return PM3_ESOFT; error = true;
} }
} }
CLIParserFree(ctx); CLIParserFree(ctx);
if (error) {
return PM3_ESOFT;
}
return dumpHF_EMRTD((char *)docnum, (char *)dob, (char *)expiry, BAC); return dumpHF_EMRTD((char *)docnum, (char *)dob, (char *)expiry, BAC);
} }
@@ -1579,7 +1583,8 @@ static int cmd_hf_emrtd_info(const char *Cmd) {
uint8_t dob[7] = { 0x00 }; uint8_t dob[7] = { 0x00 };
uint8_t expiry[7] = { 0x00 }; uint8_t expiry[7] = { 0x00 };
bool BAC = true; bool BAC = true;
int slen = 0; // unused bool error = false;
int slen = 0;
// Go through all args, if even one isn't supplied, mark BAC as unavailable // Go through all args, if even one isn't supplied, mark BAC as unavailable
if (CLIParamStrToBuf(arg_get_str(ctx, 1), docnum, 9, &slen) != 0 || slen == 0) { if (CLIParamStrToBuf(arg_get_str(ctx, 1), docnum, 9, &slen) != 0 || slen == 0) {
BAC = false; BAC = false;
@@ -1596,7 +1601,7 @@ static int cmd_hf_emrtd_info(const char *Cmd) {
if (!validate_date(dob, slen)) { if (!validate_date(dob, slen)) {
PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue."); PrintAndLogEx(ERR, "Date of birth date format is incorrect, cannot continue.");
PrintAndLogEx(HINT, "Use the format YYMMDD."); PrintAndLogEx(HINT, "Use the format YYMMDD.");
return PM3_ESOFT; error = true;
} }
} }
@@ -1606,11 +1611,14 @@ static int cmd_hf_emrtd_info(const char *Cmd) {
if (!validate_date(expiry, slen)) { if (!validate_date(expiry, slen)) {
PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue."); PrintAndLogEx(ERR, "Expiry date format is incorrect, cannot continue.");
PrintAndLogEx(HINT, "Use the format YYMMDD."); PrintAndLogEx(HINT, "Use the format YYMMDD.");
return PM3_ESOFT; error = true;
} }
} }
CLIParserFree(ctx); CLIParserFree(ctx);
if (error) {
return PM3_ESOFT;
}
return infoHF_EMRTD((char *)docnum, (char *)dob, (char *)expiry, BAC); return infoHF_EMRTD((char *)docnum, (char *)dob, (char *)expiry, BAC);
} }