github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix coverity 303441, 303442, 303486, 286660

Browse source
This commit is contained in:
iceman1001 2020-11-02 17:55:48 +01:00
commit feddfe7f43
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/cmdhfmfdes.c
View file

@ -4476,7 +4476,7 @@ static int CmdHF14aDesChk(const char *Cmd) {
PrintAndLogEx(INFO, "Loaded " _YELLOW_("%"PRIu32) " k3kdes keys", k3kkeyListLen); PrintAndLogEx(INFO, "Loaded " _YELLOW_("%"PRIu32) " k3kdes keys", k3kkeyListLen);
} }
if (!verbose) if (verbose == false)
PrintAndLogEx(INFO, "Search keys:"); PrintAndLogEx(INFO, "Search keys:");
bool result = false; bool result = false;

10
client/src/cmdlfem4x05.c
View file

@ -1932,10 +1932,12 @@ int CmdEM4x05Sniff(const char *Cmd) {
sampleData = !arg_get_lit(ctx, 1); sampleData = !arg_get_lit(ctx, 1);
fwd = arg_get_lit(ctx, 2); fwd = arg_get_lit(ctx, 2);
CLIParserFree(ctx);
// setup and sample data from Proxmark // setup and sample data from Proxmark
// if not directed to existing sample/graphbuffer // if not directed to existing sample/graphbuffer
if (sampleData) { if (sampleData) {
if (!IfPm3Lf()) { if (IfPm3Lf() == false) {
PrintAndLogEx(WARNING, "Only offline mode is available"); PrintAndLogEx(WARNING, "Only offline mode is available");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -1993,7 +1995,7 @@ int CmdEM4x05Sniff(const char *Cmd) {
((strncmp(bits, "01001", 5) == 0) && (bitidx == 12)) || ((strncmp(bits, "01001", 5) == 0) && (bitidx == 12)) ||
((strncmp(bits, "01100", 5) == 0) && (bitidx == 50)) || ((strncmp(bits, "01100", 5) == 0) && (bitidx == 50)) ||
((strncmp(bits, "01010", 5) == 0) && (bitidx == 50))) { ((strncmp(bits, "01010", 5) == 0) && (bitidx == 50))) {
memcpy(bits, &bits[1], bitidx - 1); memmove(bits, &bits[1], bitidx - 1);
bitidx--; bitidx--;
printf("Trim leading 0\n"); printf("Trim leading 0\n");
} }
@ -2066,9 +2068,9 @@ int CmdEM4x05Sniff(const char *Cmd) {
// Print results // Print results
if (haveData) { //&& (minWidth > 1) && (maxWidth > minWidth)){ if (haveData) { //&& (minWidth > 1) && (maxWidth > minWidth)){
if (pwd) if (pwd)
PrintAndLogEx(SUCCESS, "%6llu | %-10s | "_YELLOW_("%8s")" | "_YELLOW_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits); PrintAndLogEx(SUCCESS, "%6zu | %-10s | "_YELLOW_("%8s")" | "_YELLOW_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits);
else else
PrintAndLogEx(SUCCESS, "%6llu | %-10s | "_GREEN_("%8s")" | "_GREEN_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits); PrintAndLogEx(SUCCESS, "%6zu | %-10s | "_GREEN_("%8s")" | "_GREEN_("%3s")" | %s", pktOffset, cmdText, dataText, blkAddr, bits);
} }
} }