nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pre-0.64'

Browse Source
This commit is contained in:
Simon Tatham
2014-11-22 16:02:01 +00:00
parent a918c97dc9 f454235444
commit d870b5650e
8 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
windows/winplink.c
View File

@ -661,6 +661,7 @@ int main(int argc, char **argv)
if (toplevel_callback_pending()) {
ticks = 0;
next = now;
} else if (run_timers(now, &next)) {
then = now;
now = GETTICKCOUNT();
@ -670,6 +671,8 @@ int main(int argc, char **argv)
ticks = next - now;
} else {
ticks = INFINITE;
/* no need to initialise next here because we can never
* get WAIT_TIMEOUT */
}
handles = handle_get_events(&nhandles);

3
windows/winsftp.c
View File

@ -495,6 +495,7 @@ int do_eventsel_loop(HANDLE other_event)
if (toplevel_callback_pending()) {
ticks = 0;
next = now;
} else if (run_timers(now, &next)) {
then = now;
now = GETTICKCOUNT();
@ -504,6 +505,8 @@ int do_eventsel_loop(HANDLE other_event)
ticks = next - now;
} else {
ticks = INFINITE;
/* no need to initialise next here because we can never get
* WAIT_TIMEOUT */
}
handles = handle_get_events(&nhandles);

2
windows/winshare.c
View File

@ -157,6 +157,7 @@ int platform_ssh_share(const char *pi_name, Conf *conf,
if (!make_private_security_descriptor(MUTEX_ALL_ACCESS,
&psd, &acl, logtext)) {
sfree(mutexname);
sfree(name);
return SHARE_NONE;
}
@ -171,6 +172,7 @@ int platform_ssh_share(const char *pi_name, Conf *conf,
*logtext = dupprintf("CreateMutex(\"%s\") failed: %s",
mutexname, win_strerror(GetLastError()));
sfree(mutexname);
sfree(name);
LocalFree(psd);
LocalFree(acl);
return SHARE_NONE;