RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-25 00:25:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

coverity fixes

Browse source
This commit is contained in:
iceman1001 2022-03-13 04:27:23 +01:00
parent a45082e045
commit 15b8eb5935
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/src/cmddata.c
View file

@ -3061,6 +3061,7 @@ static int CmdDiff(const char *Cmd) {
PrintAndLogEx(WARNING, "Fail, transfer from device time-out"); PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
free(inA); free(inA);
free(inB); free(inB);
free(d);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }

10
client/src/cmdhf14a.c
View file

@ -2643,6 +2643,7 @@ int CmdHF14ANdefRead(const char *Cmd) {
DropField(); DropField();
return PM3_ESOFT; return PM3_ESOFT;
} }
uint16_t ndef_size = (response[0] << 8) + response[1]; uint16_t ndef_size = (response[0] << 8) + response[1];
uint16_t offset = 2; uint16_t offset = 2;
uint8_t *ndef_file = calloc(ndef_size, sizeof(uint8_t)); uint8_t *ndef_file = calloc(ndef_size, sizeof(uint8_t));
@ -2651,11 +2652,14 @@ int CmdHF14ANdefRead(const char *Cmd) {
DropField(); DropField();
return PM3_EMALLOC; return PM3_EMALLOC;
} }
if (ndef_size + offset > 0xFFFF) { if (ndef_size + offset > 0xFFFF) {
PrintAndLogEx(ERR, "NDEF size abnormally large in CmdHF14ANdef(). Aborting...\n"); PrintAndLogEx(ERR, "NDEF size abnormally large in CmdHF14ANdef(). Aborting...\n");
free(ndef_file);
DropField(); DropField();
return PM3_EOVFLOW; return PM3_EOVFLOW;
} }
for (uint16_t i = offset; i < ndef_size + offset; i += max_rapdu_size) { for (uint16_t i = offset; i < ndef_size + offset; i += max_rapdu_size) {
uint16_t segment_size = max_rapdu_size < ndef_size + offset - i ? max_rapdu_size : ndef_size + offset - i; uint16_t segment_size = max_rapdu_size < ndef_size + offset - i ? max_rapdu_size : ndef_size + offset - i;
keep_field_on = i < ndef_size + offset - max_rapdu_size; keep_field_on = i < ndef_size + offset - max_rapdu_size;
@ -2664,12 +2668,14 @@ int CmdHF14ANdefRead(const char *Cmd) {
aREAD_NDEF[2] = i >> 8; aREAD_NDEF[2] = i >> 8;
aREAD_NDEF[3] = i & 0xFF; aREAD_NDEF[3] = i & 0xFF;
aREAD_NDEF[4] = segment_size; aREAD_NDEF[4] = segment_size;
res = ExchangeAPDU14a(aREAD_NDEF, aREAD_NDEF_n + 1, activate_field, keep_field_on, response, sizeof(response), &resplen); res = ExchangeAPDU14a(aREAD_NDEF, aREAD_NDEF_n + 1, activate_field, keep_field_on, response, sizeof(response), &resplen);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
DropField(); DropField();
free(ndef_file); free(ndef_file);
return res; return res;
} }
sw = get_sw(response, resplen); sw = get_sw(response, resplen);
if (sw != 0x9000) { if (sw != 0x9000) {
PrintAndLogEx(ERR, "reading NDEF file failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff)); PrintAndLogEx(ERR, "reading NDEF file failed (%04x - %s).", sw, GetAPDUCodeDescription(sw >> 8, sw & 0xff));
@ -2677,17 +2683,21 @@ int CmdHF14ANdefRead(const char *Cmd) {
free(ndef_file); free(ndef_file);
return PM3_ESOFT; return PM3_ESOFT;
} }
if (resplen != segment_size + 2) { if (resplen != segment_size + 2) {
PrintAndLogEx(ERR, "reading NDEF file failed, expected %i bytes, got %i bytes.", segment_size, resplen - 2); PrintAndLogEx(ERR, "reading NDEF file failed, expected %i bytes, got %i bytes.", segment_size, resplen - 2);
DropField(); DropField();
free(ndef_file); free(ndef_file);
return PM3_ESOFT; return PM3_ESOFT;
} }
memcpy(ndef_file + (i - offset), response, segment_size); memcpy(ndef_file + (i - offset), response, segment_size);
} }
if (fnlen != 0) { if (fnlen != 0) {
saveFile(filename, ".bin", ndef_file, ndef_size); saveFile(filename, ".bin", ndef_file, ndef_size);
} }
NDEFRecordsDecodeAndPrint(ndef_file, ndef_size); NDEFRecordsDecodeAndPrint(ndef_file, ndef_size);
free(ndef_file); free(ndef_file);
return PM3_SUCCESS; return PM3_SUCCESS;