From: Mostyn Bramley-Moore <mostyn@antipode.se>
Date: Mon, 30 Dec 2024 16:32:39 +0000 (+0100)
Subject: Fix MSVC conversion from DWORD to short warning (#2468)
X-Git-Tag: v3.8.0~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc54b374e7c27bfc25948cb0bcdb4a6d673723a;p=thirdparty%2Flibarchive.git

Fix MSVC conversion from DWORD to short warning (#2468)
---

diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c
index f70243821..9f5b76fb9 100644
--- a/libarchive/archive_write_set_format_zip.c
+++ b/libarchive/archive_write_set_format_zip.c
@@ -453,7 +453,8 @@ archive_write_zip_options(struct archive_write *a, const char *key,
 			zip->threads = sysconf(_SC_NPROCESSORS_ONLN);
 #elif !defined(__CYGWIN__) && defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0601
 			/* Windows 7 and up */
-			zip->threads = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
+			DWORD activeProcs = GetActiveProcessorCount(ALL_PROCESSOR_GROUPS);
+			zip->threads = activeProcs <= SHRT_MAX ? (short)activeProcs : SHRT_MAX;
 #else
 			zip->threads = 1;
 #endif