From cd1510b0baf30274caf98c6c00a3773f3894987b Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Sat, 31 Jul 2021 07:46:22 -0400
Subject: [PATCH] Fix compiler warnings. Closes #2508
---
tsk/fs/fs_open.c | 6 +++---
tsk/util/detect_encryption.c | 8 ++++----
tsk/vs/mm_open.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tsk/fs/fs_open.c b/tsk/fs/fs_open.c
index c3e96e4e3..dc5eed72d 100644
--- a/tsk/fs/fs_open.c
+++ b/tsk/fs/fs_open.c
@@ -206,7 +206,7 @@ tsk_fs_open_img_decrypt(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_offset,
unsupportedSignatureFound = 1;
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_IMG_UNSUPTYPE);
- tsk_error_set_errstr(imageType);
+ tsk_error_set_errstr("%s", imageType);
free(imageType);
}
}
@@ -217,11 +217,11 @@ tsk_fs_open_img_decrypt(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_offset,
if (result != NULL) {
if (result->encryptionType == ENCRYPTION_DETECTED_SIGNATURE) {
tsk_error_set_errno(TSK_ERR_FS_ENCRYPTED);
- tsk_error_set_errstr(result->desc);
+ tsk_error_set_errstr("%s", result->desc);
}
else if (result->encryptionType == ENCRYPTION_DETECTED_ENTROPY) {
tsk_error_set_errno(TSK_ERR_FS_POSSIBLY_ENCRYPTED);
- tsk_error_set_errstr(result->desc);
+ tsk_error_set_errstr("%s", result->desc);
}
else {
tsk_error_set_errno(TSK_ERR_FS_UNKTYPE);
diff --git a/tsk/util/detect_encryption.c b/tsk/util/detect_encryption.c
index 9e64cbcaa..f50db1549 100644
--- a/tsk/util/detect_encryption.c
+++ b/tsk/util/detect_encryption.c
@@ -121,11 +121,11 @@ calculateEntropy(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
break;
}
- if (tsk_img_read(img_info, offset + i * bufLen, buf, bufLen) != bufLen) {
+ if (tsk_img_read(img_info, offset + i * bufLen, buf, bufLen) != (ssize_t) bufLen) {
break;
}
- for (int j = 0; j < bufLen; j++) {
+ for (size_t j = 0; j < bufLen; j++) {
unsigned char b = buf[j] & 0xff;
byteCounts[b]++;
}
@@ -176,7 +176,7 @@ detectVolumeEncryption(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
if (buf == NULL) {
return result;
}
- if (tsk_img_read(img_info, offset, buf, len) != len) {
+ if (tsk_img_read(img_info, offset, buf, len) != (ssize_t)len) {
free(buf);
return result;
}
@@ -250,7 +250,7 @@ detectDiskEncryption(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
if (buf == NULL) {
return result;
}
- if (tsk_img_read(img_info, offset, buf, len) != len) {
+ if (tsk_img_read(img_info, offset, buf, len) != (ssize_t)len) {
free(buf);
return result;
}
diff --git a/tsk/vs/mm_open.c b/tsk/vs/mm_open.c
index 6ac5a6ce8..ca1a413db 100644
--- a/tsk/vs/mm_open.c
+++ b/tsk/vs/mm_open.c
@@ -184,7 +184,7 @@ tsk_vs_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset,
if (result != NULL) {
if (result->encryptionType == ENCRYPTION_DETECTED_SIGNATURE) {
tsk_error_set_errno(TSK_ERR_VS_ENCRYPTED);
- tsk_error_set_errstr(result->desc);
+ tsk_error_set_errstr("%s", result->desc);
}
free(result);
result = NULL;
--
GitLab