From e872ac58f747dadb318ffaf23d3073fedc80f3fd Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 24 Oct 2019 01:30:54 +0200 Subject: [PATCH 1/3] coverity 263770 fix dead code --- armsrc/felica.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/felica.c b/armsrc/felica.c index 4d9712a0d..1374927d8 100644 --- a/armsrc/felica.c +++ b/armsrc/felica.c @@ -792,7 +792,7 @@ void felica_send_request_service(uint8_t *request_service) { // When the specified Area or Service does not exist, the card returns FFFFh as Key Version. */ uint8_t *felica_create_request_service_frame(uint8_t nodeNumber, uint8_t *idm) { - if (nodeNumber < 1 && nodeNumber > 32) { + if (nodeNumber < 1 || nodeNumber > 32) { Dbprintf("Node number out of range: 1 <= %d <= 32 - set node number to 1"); nodeNumber = 1; } From 30da3cfd429d3e2019e1d1b2de69daf3df11bc5d Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 24 Oct 2019 01:32:44 +0200 Subject: [PATCH 2/3] coverity 263769 dereference before null check --- common/crapto1/crypto1.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c index bb501cd58..dd5541b29 100644 --- a/common/crapto1/crypto1.c +++ b/common/crapto1/crypto1.c @@ -26,12 +26,11 @@ (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16) void crypto1_init(struct Crypto1State *state, uint64_t key) { + if (state == NULL) + return; state->odd = 0; state->even = 0; - - int i; - - for (i = 47; state && i > 0; i -= 2) { + for (int i = 47; i > 0; i -= 2) { state->odd = state->odd << 1 | BIT(key, (i - 1) ^ 7); state->even = state->even << 1 | BIT(key, i ^ 7); } From ff9eabdab50ade1d2440199290df950f3789e4a7 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 24 Oct 2019 01:35:58 +0200 Subject: [PATCH 3/3] coverity 226329 invalid type for printf --- client/cmdhffelica.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/cmdhffelica.c b/client/cmdhffelica.c index 1fa5b035d..bdb9cc57f 100644 --- a/client/cmdhffelica.c +++ b/client/cmdhffelica.c @@ -421,7 +421,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) { return PM3_ETIMEOUT; } - PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %"PRIu64" bytes)", tracelen); + PrintAndLogEx(SUCCESS, "Recorded Activity (trace len = %"PRIu32" bytes)", tracelen); print_hex_break(trace, tracelen, 32); printSep();