]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Fix MSVC conversion from DWORD to short warning (#2468)
authorMostyn Bramley-Moore <mostyn@antipode.se>
Mon, 30 Dec 2024 16:32:39 +0000 (17:32 +0100)
committerGitHub <noreply@github.com>
Mon, 30 Dec 2024 16:32:39 +0000 (08:32 -0800)
libarchive/archive_write_set_format_zip.c

index f7024382129d57680f1acbac4c7cc6c12e6dd812..9f5b76fb96e9ca61bedae882bbb680e1aff61b04 100644 (file)
@@ -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