From fb1ef7b8da7a03bf5d1a98ef8b35d77cb9d9b5ce Mon Sep 17 00:00:00 2001
From: Guy Harris <guy@alum.mit.edu>
Date: Tue, 20 Aug 2002 22:44:25 +0000
Subject: From Anand Narwani: fix an infinite recursion issue when decoding
 Concatenated frames which contain 0 length PDU docsis frames.

svn path=/trunk/; revision=6037
---
 plugins/docsis/packet-docsis.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c
index 0ec1d6ca73..9eca311ddc 100644
--- a/plugins/docsis/packet-docsis.c
+++ b/plugins/docsis/packet-docsis.c
@@ -2,7 +2,7 @@
  * Routines for docsis dissection
  * Copyright 2002, Anand V. Narwani <anarwani@cisco.com>
  *
- * $Id: packet-docsis.c,v 1.6 2002/08/02 22:04:13 jmayer Exp $
+ * $Id: packet-docsis.c,v 1.7 2002/08/20 22:44:25 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -487,6 +487,15 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	  concatpos += framelen;
 	}
     }
+
+  if ((fctype == FCTYPE_PACKET) && (pdulen == 0)) 
+    {
+      if (concatlen > 0)
+        {
+          concatlen = concatlen - framelen;
+          concatpos += framelen;
+        }
+    }
   if (fctype == FCTYPE_MACSPC)
     {
       switch (fcparm)
-- 
cgit v1.2.3