diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | packet.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -10,6 +10,9 @@ | |||
10 | [deattack.c misc.c session.c ssh-agent.c] | 10 | [deattack.c misc.c session.c ssh-agent.c] |
11 | more buffer allocation fixes; from Solar Designer; CAN-2003-0682; | 11 | more buffer allocation fixes; from Solar Designer; CAN-2003-0682; |
12 | ok millert@ | 12 | ok millert@ |
13 | - markus@cvs.openbsd.org 2003/09/19 09:02:02 | ||
14 | [packet.c] | ||
15 | buffer_dump only if PACKET_DEBUG is defined; Jedi/Sector One; pr 3471 | ||
13 | 16 | ||
14 | 20030922 | 17 | 20030922 |
15 | - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree | 18 | - (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree |
@@ -1175,4 +1178,4 @@ | |||
1175 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1178 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1176 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1179 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1177 | 1180 | ||
1178 | $Id: ChangeLog,v 1.2994.2.30 2003/09/23 08:59:08 dtucker Exp $ | 1181 | $Id: ChangeLog,v 1.2994.2.31 2003/09/23 09:00:41 dtucker Exp $ |
@@ -37,7 +37,7 @@ | |||
37 | */ | 37 | */ |
38 | 38 | ||
39 | #include "includes.h" | 39 | #include "includes.h" |
40 | RCSID("$OpenBSD: packet.c,v 1.109 2003/07/10 14:42:28 markus Exp $"); | 40 | RCSID("$OpenBSD: packet.c,v 1.110 2003/09/19 09:02:02 markus Exp $"); |
41 | 41 | ||
42 | #include "openbsd-compat/sys-queue.h" | 42 | #include "openbsd-compat/sys-queue.h" |
43 | 43 | ||
@@ -1020,7 +1020,9 @@ packet_read_poll2(u_int32_t *seqnr_p) | |||
1020 | cp = buffer_ptr(&incoming_packet); | 1020 | cp = buffer_ptr(&incoming_packet); |
1021 | packet_length = GET_32BIT(cp); | 1021 | packet_length = GET_32BIT(cp); |
1022 | if (packet_length < 1 + 4 || packet_length > 256 * 1024) { | 1022 | if (packet_length < 1 + 4 || packet_length > 256 * 1024) { |
1023 | #ifdef PACKET_DEBUG | ||
1023 | buffer_dump(&incoming_packet); | 1024 | buffer_dump(&incoming_packet); |
1025 | #endif | ||
1024 | packet_disconnect("Bad packet length %u.", packet_length); | 1026 | packet_disconnect("Bad packet length %u.", packet_length); |
1025 | } | 1027 | } |
1026 | DBG(debug("input: packet len %u", packet_length+4)); | 1028 | DBG(debug("input: packet len %u", packet_length+4)); |