From c262bf28bc5ad91e06f890f091d20c532159b4df Mon Sep 17 00:00:00 2001
From: AndersBroman <anders.broman@ericsson.com>
Date: Tue, 11 Aug 2015 11:08:20 +0200
Subject: [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>
---
 epan/dissectors/packet-giop.c | 4 ++++
 1 file changed, 4 insertions(+)

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;
-- 
cgit v1.2.3