summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 19:38:14 (GMT)
commit82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61 (patch)
treea7ff8791ee5b2a2c19e5b80d3fe448f524f9216c
parentdc55e3e3c2be99ba1b26ba8ee5df428afde57e1b (diff)
parent729a9b558b0408fdf60e39c96b04b33a333d8366 (diff)
downloadgit-82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61.zip
git-82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61.tar.gz
git-82ac2fbaf97aaee32c0c12e0bcb9a1866f4a0a61.tar.bz2
Merge branch 'cb/mkstemps-uint-type-fix' into maint
Variable type fix. * cb/mkstemps-uint-type-fix: wrapper: avoid undefined behaviour in macOS
-rw-r--r--wrapper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wrapper.c b/wrapper.c
index ea3cf64..1e45ab7 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;