diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2002-06-15 22:24:31 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2002-06-15 22:24:31 +0000 |
| commit | 4c7dd2df0b82c44a50fd4c410374903134dcaf34 (patch) | |
| tree | d96a662b232e96712c2de8dd8bfb484d74325d58 /packet-dcerpc-mapi.c | |
| parent | dc062c348ba7aec3ac3078c0022ad6f98d2213e0 (diff) | |
| download | wireshark-4c7dd2df0b82c44a50fd4c410374903134dcaf34.tar.gz wireshark-4c7dd2df0b82c44a50fd4c410374903134dcaf34.tar.bz2 wireshark-4c7dd2df0b82c44a50fd4c410374903134dcaf34.zip | |
Fixed bug in MAPI
If we had unreassebled DCERPC PDUs but had
decryption of MAPI enabled we would try to read too much data from the
tvbuff and ethereal would later dump core.
svn path=/trunk/; revision=5673
Diffstat (limited to 'packet-dcerpc-mapi.c')
| -rw-r--r-- | packet-dcerpc-mapi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-dcerpc-mapi.c b/packet-dcerpc-mapi.c index 362c921b0a..1a5c318583 100644 --- a/packet-dcerpc-mapi.c +++ b/packet-dcerpc-mapi.c @@ -2,7 +2,7 @@ * Routines for MS Exchange MAPI * Copyright 2002, Ronnie Sahlberg * - * $Id: packet-dcerpc-mapi.c,v 1.10 2002/06/04 07:03:44 guy Exp $ + * $Id: packet-dcerpc-mapi.c,v 1.11 2002/06/15 22:24:31 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -157,6 +157,10 @@ mapi_decrypt_pdu(tvbuff_t *tvb, int offset, offset=dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_decrypted_data_offset, NULL); offset=dissect_ndr_uint32(tvb, offset, pinfo, tree, drep, hf_mapi_decrypted_data_len, &len); + if(len>(guint32)tvb_length_remaining(tvb, offset)){ + len=tvb_length_remaining(tvb, offset); + } + if(!pinfo->fd->flags.visited){ mmd=g_mem_chunk_alloc(mapi_decrypted_data_chunk); mmd->callid=di->call_id; @@ -179,7 +183,6 @@ mapi_decrypt_pdu(tvbuff_t *tvb, int offset, add_new_data_source(pinfo, mmd->tvb, "Decrypted MAPI"); - /* decrypted PDU */ /* All from 10 minutes eyeballing. This may be wrong. The PDU is NOT NDR encoded. So this completely new marshalling |