diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-02-10 03:37:28 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-02-10 03:37:28 +0000 |
| commit | e3fdb92a67567178bc778395bcab6118b13e1083 (patch) | |
| tree | 3d8a34f179da632a8521181e9fc3b9da527e0a19 /epan/dissectors/packet-tcp.c | |
| parent | eaba461f2a7ac9f6ec63cadb5d61a69a41555dfb (diff) | |
Since the nonce and reserved bits were added in r34084, tcp.flags is now 12 bits, so its type needs to be changed from an FT_UINT8 to an FT_UINT16. This should avoid the crash experienced by Lanell Allen as reported on -dev: http://article.gmane.org/gmane.network.wireshark.devel/24846 (although in my testing on Windows XP SP3 (32-bit), Wireshark did not crash).
svn path=/trunk/; revision=40949
Diffstat (limited to 'epan/dissectors/packet-tcp.c')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index c081035e15..3f7c971aad 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -4764,7 +4764,7 @@ proto_register_tcp(void) NULL, HFILL }}, { &hf_tcp_flags, - { "Flags", "tcp.flags", FT_UINT8, BASE_HEX, NULL, 0x0, + { "Flags", "tcp.flags", FT_UINT16, BASE_HEX, NULL, TH_MASK, NULL, HFILL }}, { &hf_tcp_flags_res, |