diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-08-20 09:10:27 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-08-20 09:10:27 +0000 |
| commit | b524041d3f4bf9b30b0a2131a2f70f4a228ae04f (patch) | |
| tree | 9ba572d6b0099c4fdfea188444b72e9caa01c1c4 /packet-giop.c | |
| parent | c8b186e9e6a5e891de413c0d6b84bda7ecccfddf (diff) | |
Patch from Bernd Becker: "header->exception_id" has to be set regardless
of whether a protocol tree is being generated.
svn path=/trunk/; revision=3855
Diffstat (limited to 'packet-giop.c')
| -rw-r--r-- | packet-giop.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/packet-giop.c b/packet-giop.c index 25c3d1848e..fd8a3a86e9 100644 --- a/packet-giop.c +++ b/packet-giop.c @@ -9,7 +9,7 @@ * Frank Singleton <frank.singleton@ericsson.com> * Trevor Shepherd <eustrsd@am1.ericsson.se> * - * $Id: packet-giop.c,v 1.45 2001/07/27 18:31:56 guy Exp $ + * $Id: packet-giop.c,v 1.46 2001/08/20 09:10:27 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -2897,19 +2897,21 @@ dissect_reply_body (tvbuff_t *tvb, u_int offset, packet_info *pinfo, case USER_EXCEPTION: - if (tree) - { - sequence_length = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); + sequence_length = get_CDR_ulong(tvb, &offset, stream_is_big_endian,GIOP_HEADER_SIZE); + if (tree) + { proto_tree_add_text(tree, tvb, offset-4, 4, "Exception length: %u", sequence_length); - - if (sequence_length != 0) - { + } + if (sequence_length != 0) + { + if (tree) + { proto_tree_add_text(tree, tvb, offset, sequence_length, "Exception id: %s", tvb_format_text(tvb, offset, sequence_length)); - + } #if 1 header->exception_id = g_new0(gchar,sequence_length ); /* allocate buffer */ @@ -2922,11 +2924,9 @@ dissect_reply_body (tvbuff_t *tvb, u_int offset, packet_info *pinfo, #endif - offset += sequence_length; - } - + offset += sequence_length; + } - } /* tree */ /* @@ -3779,6 +3779,7 @@ gboolean dissect_giop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) { giop_dump_collection(cd_complete_request_list); #endif + header.exception_id = NULL; /* check magic number and version */ |