Merge pull request #2271 from lnv42/master

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