nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix multiple bugs in freeze/thaw of Windows handle-sockets.

Browse Source 
Firstly, I had asserted that data would never arrive on a handle
socket in state FREEZING, which is just an error, because FREEZING is
precisely the state of not being quite frozen _yet_ because one last
read is still expected to arrive from the winhandl.c reading subthread
which it's too late to cancel. I meant to assert that it wasn't
FROZEN.

Secondly, when the handle socket was in state FREEZING, I failed to
actually _set_ it to FROZEN.

And thirdly, when the handle socket starts thawing again (i.e. there's
now outgoing buffer space so we can start sending our backlogged
data), I forgot to ever call bufchain_consume, so that the same block
of data would get sent repeatedly.

I can only assume that nothing I've ever done has actually exercised
this code!
This commit is contained in:
Simon Tatham 2017-02-15 19:19:38 +00:00
parent 24c9cfc800
commit 2fb3e26584
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/winhsock.c
View File

@ -57,7 +57,7 @@ static int handle_gotdata(struct handle *h, void *data, int len)
} else if (len == 0) {
return plug_closing(ps->plug, NULL, 0, 0);
} else {
assert(ps->frozen != FREEZING && ps->frozen != THAWING);
assert(ps->frozen != FROZEN && ps->frozen != THAWING);
if (ps->frozen == FREEZING) {
/*
* If we've received data while this socket is supposed to
@ -66,6 +66,7 @@ static int handle_gotdata(struct handle *h, void *data, int len)
* the data for when we unfreeze.
*/
bufchain_add(&ps->inputdata, data, len);
ps->frozen = FROZEN;
/*
* And return a very large backlog, to prevent further
@ -171,6 +172,7 @@ static void handle_socket_unfreeze(void *psv)
* Hand it off to the plug.
*/
new_backlog = plug_receive(ps->plug, 0, data, len);
bufchain_consume(&ps->inputdata, len);
if (bufchain_size(&ps->inputdata) > 0) {
/*