Fix for bug #1532 -

From Kenneth Golomb:

Fixes two issues:
1) interface_name is allocated iface_len+1 bytes but a buffer length of iface
len is passed in when the string is copied.  This truncates the string to 9
characters if the interface_name is 10 characters long.

2) interface_name added to tree with proto_tree_add_string_format and is
missing the initial value parameter when called.  Even if this is added the
field can not be filtered on.  Adding the field with proto_tree_add_item fixes
both the tree display and the filtering issues.


svn path=/trunk/; revision=21730

1 files changed, 2 insertions, 2 deletions

diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index d7f1fe5569..92d48a221a 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -170,7 +170,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   	iface_len = 6;
 
   interface_name=ep_alloc(iface_len+1);
-  tvb_get_nstringz0(tvb, 2, iface_len, interface_name);
+  tvb_get_nstringz0(tvb, 2, iface_len+1, interface_name);
 
   /* Known interface name - if not, remember it */
   found=FALSE;
@@ -219,7 +219,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (fw1_iflist_with_chain)
       proto_tree_add_item(fh_tree, hf_fw1_chain, tvb, 1, 1, FALSE);
 
-    proto_tree_add_string_format(fh_tree, hf_fw1_interface, tvb, 2, iface_len, "Interface: %s", interface_name);
+    proto_tree_add_item(fh_tree, hf_fw1_interface, tvb, 2, iface_len, FALSE);
 
     if (fw1_with_uuid)
       proto_tree_add_item(fh_tree, hf_fw1_uuid, tvb, 8, 4, FALSE);