From 72ec7bf27b231b6fc18d4ea0b425776ca0db94e3 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 16 Feb 2022 22:23:16 +0100
Subject: [PATCH] fix some CodeQL warnings

---
 client/src/cmdhfmfhard.c   | 12 ++++++------
 client/src/cmdhfmfu.c      |  2 +-
 client/src/cmdhfthinfilm.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/cmdhfmfhard.c b/client/src/cmdhfmfhard.c
index 92921e9b4..6b219d574 100644
--- a/client/src/cmdhfmfhard.c
+++ b/client/src/cmdhfmfhard.c
@@ -1215,7 +1215,7 @@ static void check_for_BitFlipProperties(bool time_budget) {
 
     uint8_t args[NUM_CHECK_BITFLIPS_THREADS][3];
     uint16_t bytes_per_thread = (256 + (NUM_CHECK_BITFLIPS_THREADS / 2)) / NUM_CHECK_BITFLIPS_THREADS;
-    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+    for (uint32_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
         args[i][0] = i * bytes_per_thread;
         args[i][1] = MIN(args[i][0] + bytes_per_thread - 1, 255);
         args[i][2] = time_budget;
@@ -1224,18 +1224,18 @@ static void check_for_BitFlipProperties(bool time_budget) {
     // args[NUM_CHECK_BITFLIPS_THREADS - 1][1] = MAX(args[NUM_CHECK_BITFLIPS_THREADS - 1][1], 255);
 
     // start threads
-    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+    for (uint32_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
         pthread_create(&thread_id[i], NULL, check_for_BitFlipProperties_thread, args[i]);
     }
 
     // wait for threads to terminate:
-    for (uint8_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+    for (uint32_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
         pthread_join(thread_id[i], NULL);
     }
 
     if (hardnested_stage & CHECK_2ND_BYTES) {
         hardnested_stage &= ~CHECK_1ST_BYTES; // we are done with 1st stage, except...
-        for (uint16_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
+        for (uint32_t i = 0; i < NUM_CHECK_BITFLIPS_THREADS; i++) {
             if (args[i][1] != 0) {
                 hardnested_stage |= CHECK_1ST_BYTES;  // ... when any of the threads didn't complete in time
                 break;
@@ -2036,7 +2036,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx) {
     pthread_t thread_id[NUM_REDUCTION_WORKING_THREADS];
 
     uint16_t sums1[NUM_REDUCTION_WORKING_THREADS][3];
-    for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
+    for (uint32_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
         sums1[i][0] = sum_a0_idx;
         sums1[i][1] = sum_a8_idx;
         sums1[i][2] = i + 1;
@@ -2044,7 +2044,7 @@ static void generate_candidates(uint8_t sum_a0_idx, uint8_t sum_a8_idx) {
     }
 
     // wait for threads to terminate:
-    for (uint16_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
+    for (uint32_t i = 0; i < NUM_REDUCTION_WORKING_THREADS; i++) {
         pthread_join(thread_id[i], NULL);
     }
 
diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c
index 93a6c5e10..d67840ac9 100644
--- a/client/src/cmdhfmfu.c
+++ b/client/src/cmdhfmfu.c
@@ -4064,7 +4064,7 @@ int CmdHF14MfuNDEFRead(const char *Cmd) {
     }
 
     // read NDEF records.
-    for (uint16_t i = 0, j = 0; i < maxsize; i += 16, j += 4) {
+    for (uint32_t i = 0, j = 0; i < maxsize; i += 16, j += 4) {
         status = ul_read(4 + j, records + i, 16);
         if (status == -1) {
             DropField();
diff --git a/client/src/cmdhfthinfilm.c b/client/src/cmdhfthinfilm.c
index 320bacf4a..89520d8e3 100644
--- a/client/src/cmdhfthinfilm.c
+++ b/client/src/cmdhfthinfilm.c
@@ -92,7 +92,7 @@ static int print_barcode(uint8_t *barcode, const size_t barcode_len, bool verbos
 
     snprintf(s + strlen(s), barcode_len - 3, (const char *)&barcode[2], barcode_len - 4);
 
-    for (uint8_t i = 0; i < strlen(s); i++) {
+    for (size_t i = 0; i < strlen(s); i++) {
 
         // terminate string
         if ((uint8_t) s[i] == 0xFE) {