diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-07-23 14:53:54 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-07-23 15:38:37 +0000 |
| commit | 8575e41918c25eeaec42fc8f1510bd3f4f41d87a (patch) | |
| tree | d27497d134d1b55c0aca54518df5dac0bde012c3 | |
| parent | f6934d27bc0782a781bd3b9ec29d8d4f07c777f7 (diff) | |
NTP: fix DISSECTOR_ASSERT when decoding v6_flags
Issue include in g8d6324f75
Change-Id: I49267b90a4a196409df76cb369d2dfacf42ba8d3
Ping-Bug:11361
Reviewed-on: https://code.wireshark.org/review/9754
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ntp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index 344ea16490..f4bcf30f7b 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -1360,7 +1360,7 @@ dissect_ntp_priv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *ntp_tree, gu guint16 offset; guint i; - guint32 v6_flag; + guint32 v6_flag = 0; proto_item* monlist_item; proto_tree* monlist_item_tree; @@ -1650,7 +1650,7 @@ proto_register_ntp(void) "version", "ntp.priv.monlist.version", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ntppriv_v6_flag, { - "ipv6", "ntp.priv.monlist.ipv6", FT_BOOLEAN, BASE_NONE, + "ipv6", "ntp.priv.monlist.ipv6", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_ntppriv_addr6, { "ipv6 remote addr", "ntp.priv.monlist.addr6", FT_IPv6, BASE_NONE, |