github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-23 06:35:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix coverity 292481

Browse source
This commit is contained in:
iceman1001 2020-06-29 11:32:38 +02:00
commit e6bb7a8a87
1 changed files with 19 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

54
client/src/cmdlfem4x50.c
View file

@ -227,7 +227,7 @@ static void print_result(const em4x50_word_t *words, int fwr, int lwr) {
} }
} }
static void print_info_result(PacketResponseNG *resp, const em4x50_data_t *etd, bool bverbose) { static void print_info_result(PacketResponseNG *resp, const em4x50_data_t *etd, bool verbose) {
// display all information of info result in structured format // display all information of info result in structured format
@ -235,9 +235,9 @@ static void print_info_result(PacketResponseNG *resp, const em4x50_data_t *etd,
em4x50_word_t words[EM4X50_NO_WORDS]; em4x50_word_t words[EM4X50_NO_WORDS];
char pstring[NO_CHARS_MAX] = {0}, string[NO_CHARS_MAX] = {0}; char pstring[NO_CHARS_MAX] = {0}, string[NO_CHARS_MAX] = {0};
bool bpwd_given = etd->pwd_given; bool pwd_given = etd->pwd_given;
bool bsuccess = (resp->status & STATUS_SUCCESS) >> 1; bool success = (resp->status & STATUS_SUCCESS) >> 1;
bool blogin = resp->status & STATUS_LOGIN; bool login = resp->status & STATUS_LOGIN;
prepare_result(data, 0, EM4X50_NO_WORDS - 1, words); prepare_result(data, 0, EM4X50_NO_WORDS - 1, words);
@ -253,7 +253,7 @@ static void print_info_result(PacketResponseNG *resp, const em4x50_data_t *etd,
// data section // data section
PrintAndLogEx(NORMAL, _YELLOW_("\n em4x50 data:")); PrintAndLogEx(NORMAL, _YELLOW_("\n em4x50 data:"));
if (bverbose) { if (verbose) {
// detailed data section // detailed data section
print_result(words, 0, EM4X50_NO_WORDS - 1); print_result(words, 0, EM4X50_NO_WORDS - 1);
@ -336,47 +336,34 @@ static void print_info_result(PacketResponseNG *resp, const em4x50_data_t *etd,
sprintf(pstring, " reading "); sprintf(pstring, " reading ");
strcat(string, pstring); strcat(string, pstring);
if (!bsuccess) { if (success == false) {
sprintf(pstring, _RED_("failed")); sprintf(pstring, _RED_("failed"));
strcat(string, pstring); strcat(string, pstring);
} else { } else {
sprintf(pstring, _GREEN_("ok ")); sprintf(pstring, _GREEN_("ok "));
strcat(string, pstring); strcat(string, pstring);
if (blogin) { if (login) {
if (pwd_given) {
if (bpwd_given) {
sprintf(pstring, "(login with password 0x%02x%02x%02x%02x)", sprintf(pstring, "(login with password 0x%02x%02x%02x%02x)",
etd->password[0], etd->password[1], etd->password[0], etd->password[1],
etd->password[2], etd->password[3]); etd->password[2], etd->password[3]);
strcat(string, pstring); strcat(string, pstring);
} else { } else {
sprintf(pstring, "(login with default password 0x00000000)"); sprintf(pstring, "(login with default password 0x00000000)");
strcat(string, pstring); strcat(string, pstring);
} }
} else { } else {
if (pwd_given) {
if (bpwd_given) {
sprintf(pstring, "(login failed)"); sprintf(pstring, "(login failed)");
strcat(string, pstring); strcat(string, pstring);
} else { } else {
sprintf(pstring, "(no login)"); sprintf(pstring, "(no login)");
strcat(string, pstring); strcat(string, pstring);
} }
} }
} }
PrintAndLogEx(NORMAL,"%s\n", string); PrintAndLogEx(NORMAL,"%s\n", string);
@ -453,17 +440,15 @@ static void print_write_result(PacketResponseNG *resp, const em4x50_data_t *etd)
bool login = resp->status & STATUS_LOGIN; bool login = resp->status & STATUS_LOGIN;
uint8_t *data = resp->data.asBytes; uint8_t *data = resp->data.asBytes;
char string[NO_CHARS_MAX] = {0}, pstring[NO_CHARS_MAX] = {0}; char string[NO_CHARS_MAX] = {0}, pstring[NO_CHARS_MAX] = {0};
em4x50_word_t word; em4x50_word_t words[EM4X50_NO_WORDS];
if (!success) {
if (success == false) {
sprintf(pstring, "\n writing " _RED_("failed")); sprintf(pstring, "\n writing " _RED_("failed"));
strcat(string, pstring); strcat(string, pstring);
} else { } else {
prepare_result(data, etd->address, etd->address, &word); prepare_result(data, etd->address, etd->address, words);
print_result(&word, etd->address, etd->address); print_result(words, etd->address, etd->address);
sprintf(pstring, "\n writing " _GREEN_("ok ")); sprintf(pstring, "\n writing " _GREEN_("ok "));
strcat(string, pstring); strcat(string, pstring);
@ -658,13 +643,12 @@ static void print_sread_result(PacketResponseNG *resp, const em4x50_data_t *etd)
int now = (resp->status & STATUS_NO_WORDS) >> 2; int now = (resp->status & STATUS_NO_WORDS) >> 2;
char string[NO_CHARS_MAX] = {0}, pstring[NO_CHARS_MAX] = {0}; char string[NO_CHARS_MAX] = {0}, pstring[NO_CHARS_MAX] = {0};
uint8_t *data = resp->data.asBytes; uint8_t *data = resp->data.asBytes;
em4x50_word_t word; em4x50_word_t words[EM4X50_NO_WORDS];
if (!success) { if (success == false) {
sprintf(pstring, "\n reading " _RED_("failed")); sprintf(pstring, "\n reading " _RED_("failed"));
strcat(string, pstring); strcat(string, pstring);
PrintAndLogEx(NORMAL,"%s\n", string); PrintAndLogEx(NORMAL,"%s\n", string);
} else { } else {
@ -673,8 +657,8 @@ static void print_sread_result(PacketResponseNG *resp, const em4x50_data_t *etd)
// selective read mode // selective read mode
prepare_result(data, etd->address, etd->address, &word); prepare_result(data, etd->address, etd->address, words);
print_result(&word, etd->address, etd->address); print_result(words, etd->address, etd->address);
string[0] = '\0'; string[0] = '\0';
sprintf(pstring, "\n reading " _GREEN_("ok ")); sprintf(pstring, "\n reading " _GREEN_("ok "));
@ -699,8 +683,8 @@ static void print_sread_result(PacketResponseNG *resp, const em4x50_data_t *etd)
//standard read mode //standard read mode
prepare_result(data, 0, now - 1, &word); prepare_result(data, 0, now - 1, words);
print_result(&word, 0, now - 1); print_result(words, 0, now - 1);
string[0] = '\0'; string[0] = '\0';
sprintf(pstring, "\n reading " _GREEN_("ok ")); sprintf(pstring, "\n reading " _GREEN_("ok "));