From 160245e0d51a6085a7e8adecd019e4256bd725de Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 15 Feb 2022 16:01:23 +0100 Subject: [PATCH] fix some CodeQL warnings --- client/src/loclass/cipherutils.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/client/src/loclass/cipherutils.c b/client/src/loclass/cipherutils.c index bcfcbb7b7..eaca50325 100644 --- a/client/src/loclass/cipherutils.c +++ b/client/src/loclass/cipherutils.c @@ -147,9 +147,11 @@ void printarr(const char *name, uint8_t *arr, int len) { char *output = calloc(outsize, sizeof(char)); cx = snprintf(output, outsize, "uint8_t %s[] = {", name); for (i = 0; i < len; i++) { - cx += snprintf(output + cx, outsize - cx, "0x%02x,", *(arr + i)); //5 bytes per byte + if (cx < outsize) + cx += snprintf(output + cx, outsize - cx, "0x%02x,", *(arr + i)); //5 bytes per byte } - snprintf(output + cx, outsize - cx, "};"); + if (cx < outsize) + snprintf(output + cx, outsize - cx, "};"); PrintAndLogEx(INFO, output); free(output); } @@ -165,12 +167,16 @@ void printarr_human_readable(const char *title, uint8_t *arr, int len) { for (i = 0; i < len; i++) { if (i % 16 == 0) { - if (i == 0) - cx += snprintf(output + cx, outsize - cx, "%02x| ", i); - else - cx += snprintf(output + cx, outsize - cx, "\n%02x| ", i); + if (i == 0) { + if (cx < outsize) + cx += snprintf(output + cx, outsize - cx, "%02x| ", i); + } else { + if (cx < outsize) + cx += snprintf(output + cx, outsize - cx, "\n%02x| ", i); + } } - cx += snprintf(output + cx, outsize - cx, "%02x ", *(arr + i)); + if (cx < outsize) + cx += snprintf(output + cx, outsize - cx, "%02x ", *(arr + i)); } PrintAndLogEx(INFO, output); free(output);