diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:33:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-01-24 03:33:35 +0000 |
| commit | f2246ebb65b7640ecf7e17a974ef4521427dca47 (patch) | |
| tree | 0e9b2b89c52b9e6ccceab293202cf1051f4b1c5f /packet-icq.c | |
| parent | 9d4c965c819bf9ff2e979db0fb18dd3d8d3cfd4c (diff) | |
| download | wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.tar.gz wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.tar.bz2 wireshark-f2246ebb65b7640ecf7e17a974ef4521427dca47.zip | |
Fix a bunch of dissectors to use "pi.captured_len" rather than
"fd->cap_len" for the frame length - or to use macros such as
"BYTES_ARE_IN_FRAME()", "IS_DATA_IN_FRAME()", and "END_OF_FRAME", which
use "pi.captured_len" - so that they correctly handle frames where the
actual data length of the packet is less than the size of the raw frame,
e.g. with encapsulations such as ISL.
svn path=/trunk/; revision=1530
Diffstat (limited to 'packet-icq.c')
| -rw-r--r-- | packet-icq.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/packet-icq.c b/packet-icq.c index c4b3fa54a5..dcac588ee6 100644 --- a/packet-icq.c +++ b/packet-icq.c @@ -1,7 +1,7 @@ /* packet-icq.c * Routines for ICQ packet disassembly * - * $Id: packet-icq.c,v 1.9 1999/12/05 22:59:55 guy Exp $ + * $Id: packet-icq.c,v 1.10 2000/01/24 03:33:34 guy Exp $ * * Ethereal - Network traffic analyzer * By Johan Feyaerts @@ -1991,12 +1991,9 @@ dissect_icqv5Client(const u_char *pd, guint16 pktsize = -1; /* The size of the ICQ content */ u_char decr_pd[1600]; /* Decrypted content, size should be dynamic */ - pktsize = fd->pkt_len - offset; + pktsize = END_OF_FRAME; /* First copy the memory, we don't want to overwrite the old content */ memcpy(decr_pd, &pd[offset], pktsize); - if (fd->pkt_len > fd->cap_len) { - pktsize -= (fd->pkt_len - fd->cap_len); - } if (pktsize>0x14) { key = get_v5key(decr_pd, pktsize); decrypt_v5(decr_pd, pktsize, key); |