Kevin Reay:
> Fix multiple segfaults in the AppleTalk printer when a packet structs
> extend past the actual captured length.
While you are there...
In my tree, I'm still lugging along the patch below. This is
strictly equivalent to mikeb@'s change "Catch up with the BPF_ALIGNMENT
switch to the uint32_t" to print-{ip,ip6}.c eleven months ago, but
he didn't want me to commit it without testing against actual
AppleTalk traffic--which is unlikely to ever happen.
Index: print-atalk.c
===================================================================
RCS file: /cvs/src/usr.sbin/tcpdump/print-atalk.c,v
retrieving revision 1.29
diff -u -p -r1.29 print-atalk.c
--- print-atalk.c 21 Aug 2015 02:07:32 -0000 1.29
+++ print-atalk.c 21 Aug 2015 14:55:27 -0000
@@ -217,7 +217,7 @@ ddp_print(register const u_char *bp, reg
register u_short snet, register u_char snode, u_char skt)
{
- if ((intptr_t)bp & (sizeof(long)-1)) {
+ if ((intptr_t)bp & (sizeof(u_int32_t)-1)) {
static u_char *abuf = NULL;
int clen = snapend - bp;
if (clen > snaplen)
--
Christian "naddy" Weisgerber [email protected]
