diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-05 05:54:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-05 05:54:14 +0000 |
| commit | 36efcd0364fae2fe7aa8166fd568d6c44cb529e8 (patch) | |
| tree | b4d9b102e0d1d75d1606922c91e6ffc1572381be | |
| parent | 7778d7793154d72587e3a6f4dea179bb76eef5a0 (diff) | |
There is no string value assigned to the "ip.fragment.error",
"ip.fragment", and "ip.fragments" fields, so make them FT_NONE, not
FT_STRING. (Otherwise, if you try to do a "Match Selected" on them, we
dump core because the value is a null pointer and we try to dereference
it.)
svn path=/trunk/; revision=3512
| -rw-r--r-- | packet-ip.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packet-ip.c b/packet-ip.c index 2181a9e25a..557efc3a55 100644 --- a/packet-ip.c +++ b/packet-ip.c @@ -1,7 +1,7 @@ /* packet-ip.c * Routines for IP and miscellaneous IP protocol packet disassembly * - * $Id: packet-ip.c,v 1.133 2001/05/23 03:33:58 gerald Exp $ + * $Id: packet-ip.c,v 1.134 2001/06/05 05:54:14 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -1304,8 +1304,8 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { hf = hf_ip_fragment; } - fei = proto_tree_add_string_format(ft, hf, - tvb, 0, 0, 0, + fei = proto_tree_add_none_format(ft, hf, + tvb, 0, 0, "Frame:%d payload:%d-%d", ipfd->frame, ipfd->offset, @@ -1334,8 +1334,8 @@ dissect_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } else { /* nothing of interest for this fragment */ - proto_tree_add_string_format(ft, hf_ip_fragment, - tvb, 0, 0, 0, + proto_tree_add_none_format(ft, hf_ip_fragment, + tvb, 0, 0, "Frame:%d payload:%d-%d", ipfd->frame, ipfd->offset, @@ -1833,15 +1833,15 @@ proto_register_ip(void) "Fragment contained data past end of packet" }}, { &hf_ip_fragment_error, - { "Defragmentation error", "ip.fragment.error", FT_STRING, BASE_DEC, NULL, 0x0, + { "Defragmentation error", "ip.fragment.error", FT_NONE, BASE_NONE, NULL, 0x0, "Defragmentation error due to illegal fragments" }}, { &hf_ip_fragment, - { "IP Fragment", "ip.fragment", FT_STRING, BASE_DEC, NULL, 0x0, + { "IP Fragment", "ip.fragment", FT_NONE, BASE_NONE, NULL, 0x0, "IP Fragment" }}, { &hf_ip_fragments, - { "IP Fragments", "ip.fragments", FT_STRING, BASE_DEC, NULL, 0x0, + { "IP Fragments", "ip.fragments", FT_NONE, BASE_NONE, NULL, 0x0, "IP Fragments" }}, }; static gint *ett[] = { |