]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
archive_read_support_format_tar: avoid always-true comparsion
authorMartin Matuska <martin@matuska.de>
Thu, 8 Dec 2022 15:27:31 +0000 (16:27 +0100)
committerMartin Matuska <martin@matuska.de>
Thu, 8 Dec 2022 15:30:10 +0000 (16:30 +0100)
Reported by: GitHub CodeQL
Code Scanning Alert: 125

libarchive/archive_read_support_format_tar.c

index e31f1cc441451111411870f39e727f0aec9c84a2..93c3fd585731537e771143c86f2ea6e2f46dcb43 100644 (file)
@@ -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;
        }