From Jari Mustajarvi: fix handling of PDUs with 2-byte-long variable and

optional pointers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9600 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index b072d7325a9f0c41e8f3589ce47f987c7059c0a6..4eb5b9989c658b4d0730839f61ebfab820acedfa 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2016,6 +2016,7 @@ And assorted fixes and enhancements by the people listed above and by:
        <melerski [AT] poczta.onet.pl>
        Arnaud Jacques <webmaster [AT] securiteinfo.com>
        D. Manzella <manzella [AT] lucent.com>
+       Jari Mustajarvi <jari.mustajarvi [AT] nokia.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.

diff --git a/doc/ethereal.pod b/doc/ethereal.pod
index a9b9b66f29865d36314487e10b4ac83c175184be..b210c852a4b9d64c073b4f92eeb167347d1fbbcd 100644 (file)
--- a/doc/ethereal.pod
+++ b/doc/ethereal.pod
@@ -2075,6 +2075,8 @@ B<http://www.ethereal.com>.
   Felix Fei                <felix.fei [AT] utstar.com>
   Christoph Neusch         <christoph.neusch [AT] nortelnetworks.com>
   Jan Kiszka               <jan.kiszka [AT] web.de>
+  Joshua Craig Douglas     <jdouglas [AT] enterasys.com>
+  Dick Gooris              <gooris [AT] lucent.com>
   Pavel Roskin             <proski [AT] gnu.org>
   Georgi Guninski          <guninski [AT] guninski.com>
   Jason Copenhaver         <jcopenha [AT] typedef.org>
@@ -2105,8 +2107,7 @@ B<http://www.ethereal.com>.
                            <melerski [AT] poczta.onet.pl>
   Arnaud Jacques           <webmaster [AT] securiteinfo.com>
   D. Manzella              <manzella [AT] lucent.com>
-  Joshua Craig Douglas     <jdouglas [AT] enterasys.com>
-  Dick Gooris              <gooris [AT] lucent.com>
+  Jari Mustajarvi          <jari.mustajarvi [AT] nokia.com>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.

diff --git a/packet-sccp.c b/packet-sccp.c
index f447d3efa7ff8672cd963f68115ca239926d0c59..d9c4ef5c72bb71ac6fa7c59766e15cbc790536b4 100644 (file)
--- a/packet-sccp.c
+++ b/packet-sccp.c
@@ -8,7 +8,7 @@
  *
  * Copyright 2002, Jeff Morriss <jeff.morriss[AT]ulticom.com>
  *
- * $Id: packet-sccp.c,v 1.19 2003/12/18 00:43:48 guy Exp $
+ * $Id: packet-sccp.c,v 1.20 2004/01/08 20:19:03 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1549,6 +1549,8 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree,
     proto_tree_add_uint(sccp_tree, hf_var, tvb, \
                        offset, ptr_size, var); \
     var += offset; \
+    if (ptr_size == POINTER_LENGTH_LONG) \
+       var += 1; \
     offset += ptr_size;
 
 /* Macro for getting pointer to optional parameters */
@@ -1560,6 +1562,8 @@ dissect_sccp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccp_tree,
     proto_tree_add_uint(sccp_tree, hf_sccp_optional_pointer, tvb, \
                        offset, ptr_size, optional_pointer); \
     optional_pointer += offset; \
+    if (ptr_size == POINTER_LENGTH_LONG) \
+       optional_pointer += 1; \
     offset += ptr_size;