osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Alexis La Goutte 2015-07-23 14:53:54 +02:00 committed by Anders Broman
parent f6934d27bc
commit 8575e41918
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ntp.c
View File

@ -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,