RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2271 from lnv42/master

Browse source 
cmdhf15: fix sanity checks (uidlen alone is > 1 when -u is set)
This commit is contained in:
Iceman 2024-01-24 18:05:08 +01:00 committed by GitHub
parent db616ce7bf 472b6a8c64
commit 7afe2dab8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/src/cmdhf15.c
View file

@ -936,7 +936,7 @@ static int CmdHF15Info(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
// sanity checks // sanity checks
if ((scan + unaddressed + uidlen) > 1) { if ((scan + unaddressed + (uidlen > 0)) > 1) {
PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid"); PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -1639,7 +1639,7 @@ static int CmdHF15WriteDsfid(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
// sanity checks // sanity checks
if ((scan + unaddressed + uidlen) > 1) { if ((scan + unaddressed + (uidlen > 0)) > 1) {
PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid"); PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -2588,7 +2588,7 @@ static int CmdHF15Restore(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
// sanity checks // sanity checks
if ((scan + unaddressed + uidlen) > 1) { if ((scan + unaddressed + (uidlen > 0)) > 1) {
PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid"); PrintAndLogEx(WARNING, "Select only one option /scan/unaddress/uid");
return PM3_EINVARG; return PM3_EINVARG;
} }