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

added some error handling

Browse source
This commit is contained in:
merlokk 2019-11-29 17:34:54 +02:00
commit 8e6f08835d
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/cmdhfmfp.c
View file

@ -752,12 +752,25 @@ static int CmdHFMFPChk(const char *cmd) {
bool pattern1b = arg_get_lit(7); bool pattern1b = arg_get_lit(7);
bool pattern2b = arg_get_lit(8); bool pattern2b = arg_get_lit(8);
if (pattern1b && pattern2b) {
PrintAndLogEx(ERROR, "Pattern search mode must be 2-byte or 1-byte only.");
return PM3_EINVARG;
}
uint16_t startPattern = 0x0000; uint16_t startPattern = 0x0000;
uint8_t vpattern[2]; uint8_t vpattern[2];
int vpatternlen = 0; int vpatternlen = 0;
CLIGetHexWithReturn(9, vpattern, &vpatternlen); CLIGetHexWithReturn(9, vpattern, &vpatternlen);
if (vpatternlen > 0 && vpatternlen <= 2) if (vpatternlen > 0) {
if (vpatternlen > 0 && vpatternlen <= 2) {
startPattern = (vpattern[0] << 8) + vpattern[1]; startPattern = (vpattern[0] << 8) + vpattern[1];
} else {
PrintAndLogEx(ERROR, "Pattern must be 2-byte length.");
return PM3_EINVARG;
}
if (!pattern2b)
PrintAndLogEx(WARNING, "Pattern entered, but search mode not is 2-byte search.");
}
CLIParserFree(); CLIParserFree();
@ -809,7 +822,6 @@ static int CmdHFMFPChk(const char *cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
res = MFPKeyCheck(startSector, endSector, startKeyAB, endKeyAB, keyList, keyListLen, foundKeys); res = MFPKeyCheck(startSector, endSector, startKeyAB, endKeyAB, keyList, keyListLen, foundKeys);
printf("--- res: %d\n", res); printf("--- res: %d\n", res);