RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-01 10:34:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

coverity 303194

Browse source
This commit is contained in:
iceman1001 2020-10-05 10:31:53 +02:00
parent 24ec194428
commit f6640966ed
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client/src/cmdhfst.c
View file

@ -325,8 +325,8 @@ static int cmd_hf_st_sim(const char *Cmd) {
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
CLIGetHexWithReturn(ctx, 1, uid, &uidlen); CLIGetHexWithReturn(ctx, 1, uid, &uidlen);
CLIParserFree(ctx);
if (uidlen != 7) { if (uidlen != 7) {
PrintAndLogEx(ERR, "UID must be 7 hex bytes"); PrintAndLogEx(ERR, "UID must be 7 hex bytes");
@ -350,12 +350,12 @@ static int cmd_hf_st_ndef(const char *Cmd) {
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("p", "password", "<hex>", "16 byte read password"), arg_str0("p", "pwd", "<hex>", "16 byte read password"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, true); CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIGetHexWithReturn(ctx, 1, pwd, &pwdlen); CLIGetHexWithReturn(ctx, 1, pwd, &pwdlen);
CLIParserFree(ctx);
if (pwdlen == 0) { if (pwdlen == 0) {
with_pwd = false; with_pwd = false;
@ -483,13 +483,10 @@ static int cmd_hf_st_protect(const char *Cmd) {
disable_protection = arg_get_lit(ctx, 2); disable_protection = arg_get_lit(ctx, 2);
read_protection = arg_get_lit(ctx, 3); read_protection = arg_get_lit(ctx, 3);
write_protection = arg_get_lit(ctx, 4); write_protection = arg_get_lit(ctx, 4);
CLIGetHexWithReturn(ctx, 5, pwd, &pwdlen); CLIGetHexWithReturn(ctx, 5, pwd, &pwdlen);
CLIParserFree(ctx); CLIParserFree(ctx);
//Validations //Validations
if (enable_protection && disable_protection) { if (enable_protection && disable_protection) {
PrintAndLogEx(ERR, "Must specify either enable or disable protection, not both"); PrintAndLogEx(ERR, "Must specify either enable or disable protection, not both");
return PM3_EINVARG; return PM3_EINVARG;
@ -625,14 +622,12 @@ static int cmd_hf_st_pwd(const char *Cmd) {
change_read_password = arg_get_lit(ctx, 1); change_read_password = arg_get_lit(ctx, 1);
change_write_password = arg_get_lit(ctx, 2); change_write_password = arg_get_lit(ctx, 2);
CLIGetHexWithReturn(ctx, 3, pwd, &pwdlen); CLIGetHexWithReturn(ctx, 3, pwd, &pwdlen);
CLIGetHexWithReturn(ctx, 4, newpwd, &newpwdlen); CLIGetHexWithReturn(ctx, 4, newpwd, &newpwdlen);
CLIParserFree(ctx);
if (change_read_password && change_write_password) { if (change_read_password && change_write_password) {
PrintAndLogEx(ERR, "Must specify either read or write, not both"); PrintAndLogEx(ERR, "Must specify either read or write, not both");
CLIParserFree(ctx);
return PM3_EINVARG; return PM3_EINVARG;
} else { } else {
if (change_read_password) { if (change_read_password) {
@ -643,8 +638,6 @@ static int cmd_hf_st_pwd(const char *Cmd) {
} }
} }
CLIParserFree(ctx);
if (pwdlen != 16) { if (pwdlen != 16) {
PrintAndLogEx(ERR, "Original write password must be 16 hex bytes"); PrintAndLogEx(ERR, "Original write password must be 16 hex bytes");
return PM3_EINVARG; return PM3_EINVARG;
@ -727,9 +720,7 @@ static int cmd_hf_st_pwd(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
} }
PrintAndLogEx(SUCCESS, " %s password changed", ((changePwd[2] & 0x01) == 0x01) ? _YELLOW_("read") : _YELLOW_("write")); PrintAndLogEx(SUCCESS, " %s password changed", ((changePwd[2] & 0x01) == 0x01) ? _YELLOW_("read") : _YELLOW_("write"));
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int cmd_hf_st_list(const char *Cmd) { static int cmd_hf_st_list(const char *Cmd) {