global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-28 03:22:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1003 from shoelzer/master

Browse Source 
poll: Use GetTickCount64 to avoid wraparound issues
This commit is contained in:
Johannes Schindelin
2017-02-21 14:55:36 +01:00
parent 4efb0a6f92 0e658a7104
commit df80cbcb8d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
compat/poll/poll.c
View File

@@ -446,7 +446,8 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
static HANDLE hEvent;
WSANETWORKEVENTS ev;
HANDLE h, handle_array[FD_SETSIZE + 2];
DWORD ret, wait_timeout, nhandles, start = 0, elapsed, orig_timeout = 0;
DWORD ret, wait_timeout, nhandles, elapsed, orig_timeout = 0;
ULONGLONG start = 0;
fd_set rfds, wfds, xfds;
BOOL poll_again;
MSG msg;
@@ -462,7 +463,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
if (timeout != INFTIM)
{
orig_timeout = timeout;
start = GetTickCount();
start = GetTickCount64();
}
if (!hEvent)
@@ -611,7 +612,7 @@ restart:
if (!rc && orig_timeout && timeout != INFTIM)
{
elapsed = GetTickCount() - start;
elapsed = (DWORD)(GetTickCount64() - start);
timeout = elapsed >= orig_timeout ? 0 : orig_timeout - elapsed;
}