From 0697080e267d5619767fc597a13e5feb4e0a4a9b Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Tue, 19 Jan 2016 16:58:07 +0100 Subject: [PATCH] FIX: CoverityScan complains on getchar(), not reading the returning value --- client/cmdhfmf.c | 27 +++++++++++++++++---------- client/cmdlft55xx.c | 7 +++++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 177d2632..00252661 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -20,7 +20,8 @@ int CmdHF14AMifare(const char *Cmd) uint32_t nt = 0, nr = 0; uint64_t par_list = 0, ks_list = 0, r_key = 0; int16_t isOK = 0; - + int tmpchar; + UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}}; // message @@ -29,21 +30,25 @@ int CmdHF14AMifare(const char *Cmd) printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n"); printf("-------------------------------------------------------------------------\n"); - time_t time1 = clock(); + clock_t t = clock(); start: clearCommandBuffer(); SendCommand(&c); //flush queue - while (ukbhit()) getchar(); + while (ukbhit()) { + tmpchar = getchar(); + (void)tmpchar; + } // wait cycle while (true) { printf("."); fflush(stdout); if (ukbhit()) { - getchar(); + tmpchar = getchar(); + (void)tmpchar; printf("\naborted via keyboard!\n"); break; } @@ -86,9 +91,9 @@ start: printf("------------------------------------------------------------------\n"); PrintAndLog("Found valid key: %012"llx" \n", r_key); } - - PrintAndLog("Time in darkside: %1.0f seconds", (float)(clock() - time1)/CLOCKS_PER_SEC); - PrintAndLog(""); + t = clock() - t; + //printf("Time in darkside: %d ticks - %1.2f seconds\n", t, ((float)t)/CLOCKS_PER_SEC); + printf("Time in darkside: %Lf ticks - %1.2Lf seconds\n", (long double)t, ((long double)t)/CLOCKS_PER_SEC); return 0; } @@ -765,7 +770,7 @@ int CmdHF14AMfNested(const char *Cmd) } } - PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC); + PrintAndLog("Time in nested: %1.2f (%1.2f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC); PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations); //print them @@ -1120,7 +1125,7 @@ int CmdHF14AMfChk(const char *Cmd) } } // time - time_t time1 = clock(); + clock_t time1 = clock(); for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) { int b=blockNo; @@ -2012,6 +2017,7 @@ int CmdHF14AMfSniff(const char *Cmd){ bool wantSaveToEmlFile = 0; //var + int tmpchar; int res = 0; int len = 0; int blockLen = 0; @@ -2062,7 +2068,8 @@ int CmdHF14AMfSniff(const char *Cmd){ printf("."); fflush(stdout); if (ukbhit()) { - getchar(); + tmpchar = getchar(); + (void)tmpchar; printf("\naborted via keyboard!\n"); break; } diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index b26973e6..7684bcc7 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -1377,6 +1377,7 @@ int CmdT55xxBruteForce(const char *Cmd) { char buf[9]; char filename[FILE_PATH_SIZE]={0}; int keycnt = 0; + int c; uint8_t stKeyBlock = 20; uint8_t *keyBlock = NULL, *p = NULL; keyBlock = calloc(stKeyBlock, 6); @@ -1451,7 +1452,8 @@ int CmdT55xxBruteForce(const char *Cmd) { for (uint16_t c = 0; c < keycnt; ++c ) { if (ukbhit()) { - getchar(); + c = getchar(); + (void)c; printf("\naborted via keyboard!\n"); free(keyBlock); return 0; @@ -1501,7 +1503,8 @@ int CmdT55xxBruteForce(const char *Cmd) { printf("."); fflush(stdout); if (ukbhit()) { - getchar(); + c = getchar(); + (void)c; printf("\naborted via keyboard!\n"); free(keyBlock); return 0; -- 2.39.5