From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Jul 2019 19:38:14 +0000 (-0700)
Subject: Merge branch 'cb/mkstemps-uint-type-fix' into maint
X-Git-Tag: v2.23.0-rc0~1^2~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61?hp=dc55e3e3c2be99ba1b26ba8ee5df428afde57e1b

Merge branch 'cb/mkstemps-uint-type-fix' into maint

Variable type fix.

* cb/mkstemps-uint-type-fix:
wrapper: avoid undefined behaviour in macOS
---

diff --git a/wrapper.c b/wrapper.c
index ea3cf64d4c..1e45ab7b92 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -502,7 +502,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
 	 * Try TMP_MAX different filenames.
 	 */
 	gettimeofday(&tv, NULL);
-	value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid();
+	value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
 	filename_template = &pattern[len - 6 - suffix_len];
 	for (count = 0; count < TMP_MAX; ++count) {
 		uint64_t v = value;