zip: Fix Visual Studio compiler warnings (#2186)

Use casts where appropriate (values cannot exceed data type limits).

Fixes following warnings:

warning C4244: '=': conversion from 'int64_t' to 'long', possible loss
of data
warning C4244: '=': conversion from 'uint64_t' to 'size_t', possible
loss of data

diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
index ac80a99ad9cb4ad11876631abafe2291b77325c1..689346882ec78f576d3131f94898823ec1cffbf6 100644 (file)
--- a/libarchive/archive_read_support_format_zip.c
+++ b/libarchive/archive_read_support_format_zip.c
@@ -1924,7 +1924,7 @@ zip_read_data_zipx_xz(struct archive_read *a, const void **buff,
                return (ARCHIVE_FATAL);
        }
 
-       in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
+       in_bytes = (ssize_t)zipmin(zip->entry_bytes_remaining, bytes_avail);
        zip->zipx_lzma_stream.next_in = compressed_buf;
        zip->zipx_lzma_stream.avail_in = in_bytes;
        zip->zipx_lzma_stream.total_in = 0;
@@ -1966,14 +1966,14 @@ zip_read_data_zipx_xz(struct archive_read *a, const void **buff,
                        break;
        }
 
-       to_consume = zip->zipx_lzma_stream.total_in;
+       to_consume = (ssize_t)zip->zipx_lzma_stream.total_in;
 
        __archive_read_consume(a, to_consume);
        zip->entry_bytes_remaining -= to_consume;
        zip->entry_compressed_bytes_read += to_consume;
        zip->entry_uncompressed_bytes_read += zip->zipx_lzma_stream.total_out;
 
-       *size = zip->zipx_lzma_stream.total_out;
+       *size = (size_t)zip->zipx_lzma_stream.total_out;
        *buff = zip->uncompressed_buffer;
 
        return (ARCHIVE_OK);
@@ -2014,7 +2014,7 @@ zip_read_data_zipx_lzma_alone(struct archive_read *a, const void **buff,
        }
 
        /* Set decompressor parameters. */
-       in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
+       in_bytes = (ssize_t)zipmin(zip->entry_bytes_remaining, bytes_avail);
 
        zip->zipx_lzma_stream.next_in = compressed_buf;
        zip->zipx_lzma_stream.avail_in = in_bytes;
@@ -2024,7 +2024,7 @@ zip_read_data_zipx_lzma_alone(struct archive_read *a, const void **buff,
                /* These lzma_alone streams lack end of stream marker, so let's
                 * make sure the unpacker won't try to unpack more than it's
                 * supposed to. */
-               zipmin((int64_t) zip->uncompressed_buffer_size,
+               (size_t)zipmin((int64_t) zip->uncompressed_buffer_size,
                    zip->entry->uncompressed_size -
                    zip->entry_uncompressed_bytes_read);
        zip->zipx_lzma_stream.total_out = 0;
@@ -2061,7 +2061,7 @@ zip_read_data_zipx_lzma_alone(struct archive_read *a, const void **buff,
                        return (ARCHIVE_FATAL);
        }
 
-       to_consume = zip->zipx_lzma_stream.total_in;
+       to_consume = (ssize_t)zip->zipx_lzma_stream.total_in;
 
        /* Update pointers. */
        __archive_read_consume(a, to_consume);
@@ -2082,7 +2082,7 @@ zip_read_data_zipx_lzma_alone(struct archive_read *a, const void **buff,
        }
 
        /* Return values. */
-       *size = zip->zipx_lzma_stream.total_out;
+       *size = (size_t)zip->zipx_lzma_stream.total_out;
        *buff = zip->uncompressed_buffer;
 
        /* If we're here, then we're good! */
@@ -2331,7 +2331,7 @@ zip_read_data_zipx_bzip2(struct archive_read *a, const void **buff,
                return (ARCHIVE_FATAL);
        }
 
-       in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
+       in_bytes = (ssize_t)zipmin(zip->entry_bytes_remaining, bytes_avail);
        if(in_bytes < 1) {
                /* libbz2 doesn't complain when caller feeds avail_in == 0.
                 * It will actually return success in this case, which is
@@ -2394,7 +2394,7 @@ zip_read_data_zipx_bzip2(struct archive_read *a, const void **buff,
        zip->entry_uncompressed_bytes_read += total_out;
 
        /* Give libarchive its due. */
-       *size = total_out;
+       *size = (size_t)total_out;
        *buff = zip->uncompressed_buffer;
 
        return ARCHIVE_OK;
@@ -2478,7 +2478,7 @@ zip_read_data_zipx_zstd(struct archive_read *a, const void **buff,
                return (ARCHIVE_FATAL);
        }
 
-       in_bytes = zipmin(zip->entry_bytes_remaining, bytes_avail);
+       in_bytes = (ssize_t)zipmin(zip->entry_bytes_remaining, bytes_avail);
        if(in_bytes < 1) {
                /* zstd doesn't complain when caller feeds avail_in == 0.
                 * It will actually return success in this case, which is
@@ -2524,7 +2524,7 @@ zip_read_data_zipx_zstd(struct archive_read *a, const void **buff,
        zip->entry_uncompressed_bytes_read += total_out;
 
        /* Give libarchive its due. */
-       *size = total_out;
+       *size = (size_t)total_out;
        *buff = zip->uncompressed_buffer;
 
        return ARCHIVE_OK;

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index e37e7b5edda1024b7c6149d6dc1b9761295edbc0..e01cde6871dc0ee1efb9b86b12ce332e9925b4ce 100644 (file)
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -906,7 +906,7 @@ archive_write_zip_header(struct archive_write *a, struct archive_entry *entry)
                        archive_le32enc(e, (uint32_t)archive_entry_ctime(entry));
                        e += 4;
                }
-               archive_le16enc(ut + 2, e - ut - 4);
+               archive_le16enc(ut + 2, (uint16_t)(e - ut - 4));
        }
 
        /*