From 144a4acb29660b51b01ae3f99bb7d2499a395a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Piel?= Date: Thu, 16 Mar 2017 21:00:40 -0400 Subject: [PATCH] Bugfix GIOP LocateRequest v1.0 Bug: 13488 Change-Id: If4717dee805fdb3e910e2ea8ef16352294b305c6 Reviewed-on: https://code.wireshark.org/review/20575 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-giop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 04e307c4b5..e83a803335 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -4582,13 +4582,13 @@ dissect_giop_locate_request( tvbuff_t * tvb, packet_info * pinfo, len = get_CDR_ulong(tvb, &offset, stream_is_big_endian, GIOP_HEADER_SIZE); proto_tree_add_uint (locate_request_tree, hf_giop_objekt_key_len, tvb, offset-4, 4, len); - if (len > (guint32)tvb_reported_length_remaining(tvb, offset-4)) { + if (len > (guint32)tvb_reported_length_remaining(tvb, offset)) { expert_add_info_format(pinfo, tf, &ei_giop_length_too_big, "Object key length bigger than packet size"); return; } if (len > 0) { - proto_tree_add_item(locate_request_tree, hf_giop_objekt_key, tvb, offset-len, len, ENC_NA); + proto_tree_add_item(locate_request_tree, hf_giop_objekt_key, tvb, offset, len, ENC_NA); } } else /* GIOP 1.2 and higher */