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

Outgoing packet logging: log the right amount of data.

Browse Source 
I must have introduced this bug yesterday when I rewrote the packet
censoring functions using BinarySource. The base pointer passed to
log_packet was pointing at the right place, but the accompanying
length was the gross rather than net one, as it were - it counted the
extra header data we're about to insert at the _start_ of the packet,
so log_packet() was trying to print that many extra bytes at the _end_
and overrunning its buffer.
This commit is contained in:
Simon Tatham 2018-06-03 07:08:47 +01:00
parent 6cbca87a62
commit 7079cf06c8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssh.c
View File

@ -1492,8 +1492,7 @@ static void ssh1_log_outgoing_packet(Ssh ssh, const struct Packet *pkt)
log_packet(ssh->logctx, PKT_OUTGOING, pkt->data[12], log_packet(ssh->logctx, PKT_OUTGOING, pkt->data[12],
ssh1_pkt_type(pkt->data[12]), ssh1_pkt_type(pkt->data[12]),
pkt->body, pkt->length, src->data, src->len, nblanks, blanks, NULL, 0, NULL);
nblanks, blanks, NULL, 0, NULL);
} }
/* /*
@ -1742,7 +1741,7 @@ static void ssh2_log_outgoing_packet(Ssh ssh, const struct Packet *pkt)
log_packet(ssh->logctx, PKT_OUTGOING, pkt->data[5], log_packet(ssh->logctx, PKT_OUTGOING, pkt->data[5],
ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx, pkt->data[5]), ssh2_pkt_type(ssh->pkt_kctx, ssh->pkt_actx, pkt->data[5]),
pkt->body, pkt->length, nblanks, blanks, src->data, src->len, nblanks, blanks,
&ssh->v2_outgoing_sequence, &ssh->v2_outgoing_sequence,
pkt->downstream_id, pkt->additional_log_text); pkt->downstream_id, pkt->additional_log_text);
} }