summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Matuska <martin@matuska.de>2022-12-08 16:27:31 +0100
committerMartin Matuska <martin@matuska.de>2022-12-08 16:30:10 +0100
commite2f7c1dcb9ed47c482faaaa07db8b74178356c98 (patch)
tree5cb80c53935be6ae2cd944a74645aa36a22a3263
parent09b2d329bf58ecec06b476ad2510428c73186e99 (diff)
downloadlibarchive-e2f7c1dcb9ed47c482faaaa07db8b74178356c98.tar.gz
archive_read_support_format_tar: avoid always-true comparsion
Reported by: GitHub CodeQL Code Scanning Alert: 125
-rw-r--r--libarchive/archive_read_support_format_tar.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index e31f1cc4..93c3fd58 100644
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -407,14 +407,13 @@ archive_read_format_tar_bid(struct archive_read *a, int best_bid)
/*
* Check format of mode/uid/gid/mtime/size/rdevmajor/rdevminor fields.
*/
- if (bid > 0 && (
- validate_number_field(header->mode, sizeof(header->mode)) == 0
+ if (validate_number_field(header->mode, sizeof(header->mode)) == 0
|| validate_number_field(header->uid, sizeof(header->uid)) == 0
|| validate_number_field(header->gid, sizeof(header->gid)) == 0
|| validate_number_field(header->mtime, sizeof(header->mtime)) == 0
|| validate_number_field(header->size, sizeof(header->size)) == 0
|| validate_number_field(header->rdevmajor, sizeof(header->rdevmajor)) == 0
- || validate_number_field(header->rdevminor, sizeof(header->rdevminor)) == 0)) {
+ || validate_number_field(header->rdevminor, sizeof(header->rdevminor)) == 0) {
bid = 0;
}