github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Bugfix AutoCloseHandler(): accommodate wraparound of 32 bit time 

- GetTickcount() and current-time passed-in to the callback are
  both 32 bit which wraps around every ~50 days. In the stop
  condition compare the elasped ticks and timeout value instead
  of end-time and now. The latter can wraparound in a long-running
  process.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/589/head
Selva Nair 2023-01-17 15:36:31 -05:00
parent e4089c2141
commit 6c6bf9e4e6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openvpn.c
View File

@ -453,15 +453,15 @@ AutoCloseHandler(HWND hwnd, UINT UNUSED msg, UINT_PTR id, DWORD now)
if (!ac) if (!ac)
return; return;
UINT end = ac->start + ac->timeout; DWORD elapsed = now - ac->start;
if (now >= end) if (elapsed >= ac->timeout)
{ {
SimulateButtonPress(hwnd, ac->btn); SimulateButtonPress(hwnd, ac->btn);
AutoCloseCancel(hwnd); AutoCloseCancel(hwnd);
} }
else else
{ {
SetDlgItemText(hwnd, ac->txtid, LoadLocalizedString(ac->txtres, (end - now)/1000)); SetDlgItemText(hwnd, ac->txtid, LoadLocalizedString(ac->txtres, (ac->timeout - elapsed)/1000));
SetTimer(hwnd, id, 500, AutoCloseHandler); SetTimer(hwnd, id, 500, AutoCloseHandler);
} }
} }