Add some length checking.

svn path=/trunk/; revision=14113

1 files changed, 8 insertions, 2 deletions

diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index f2ab639b25..4c241ed123 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -4787,8 +4787,11 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset,
   /* return if zero length sequence */
 
   if (seqlen == 0) {
-    if (tf)
+    if (tf) {
+      if (*offset - start_offset <= 0)
+        THROW(ReportedBoundsError);
       proto_item_set_len(tf, *offset - start_offset);
+    }
 
     return;
   }
@@ -4876,8 +4879,11 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset,
 
   } /* for seqlen  */
 
-  if (tf)
+  if (tf) {
+    if (*offset - start_offset <= 0)
+      THROW(ReportedBoundsError);
     proto_item_set_len(tf, *offset - start_offset);
+  }
 
 }