summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2015-08-11 11:08:20 +0200
committerAnders Broman <a.broman58@gmail.com>2015-08-11 09:16:13 +0000
commitc262bf28bc5ad91e06f890f091d20c532159b4df (patch)
tree1a698ffc41641c1a28109a6a259cf3e1caf33d5a /epan
parent56a9b5377312f0bb769ecb710f83430f641f41dd (diff)
downloadwireshark-c262bf28bc5ad91e06f890f091d20c532159b4df.tar.gz
[GIOP] A GIOP message can have size = 0 (CloseConnection)
Change-Id: I1feb6135c79191aa3ac7f36bbc969e6b36314107 Reviewed-on: https://code.wireshark.org/review/9969 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-giop.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index db10250129..45ee37cb06 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -4777,6 +4777,10 @@ static int dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree
return 8;
}
+ if (message_size == 0) {
+ return 8;
+ }
+
if (header.flags & GIOP_MESSAGE_FLAGS_ZIOP_ENABLED)
{
gint rem_len;