nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Prevent sending double-EOF in raw backend.

Browse Source 
You can't call sk_write_eof() twice on the same socket, because the
second one will fail an assertion. Instead, you're supposed to know
you've already sent EOF, and not try to send it again.

The call to sk_write_eof() in raw_special (triggered by pressing ^D in
GUI PuTTY, for example) sets the flag raw->sent_socket_eof in an
attempt to prevent this. But it doesn't _check_ that flag, so a second
press of ^D can reach that assertion failure.

(cherry picked from commit 9f2e1e6e03043f551b1a449991ea45d954204808)
This commit is contained in:
Simon Tatham 2022-12-21 15:13:46 +00:00
parent 1405659dee
commit 07911c8735
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
otherbackends/raw.c
View File

@ -285,6 +285,7 @@ static void raw_special(Backend *be, SessionSpecialCode code, int arg)
{ {
Raw *raw = container_of(be, Raw, backend); Raw *raw = container_of(be, Raw, backend);
if (code == SS_EOF && raw->s) { if (code == SS_EOF && raw->s) {
if (!raw->sent_socket_eof)
sk_write_eof(raw->s); sk_write_eof(raw->s);
raw->sent_socket_eof= true; raw->sent_socket_eof= true;
raw_check_close(raw); raw_check_close(raw);