diff options
| author | cturney <cturney@charter.net> | 2015-07-01 16:07:29 -0400 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-07-02 04:41:41 +0000 |
| commit | b591f07273f4e055a286ca36b6fda5da99952b5d (patch) | |
| tree | a0a2105c7de4dab622b6aaead1f246a0e483dd9f | |
| parent | a66714bbad67f92e47f8b5fd5feca5743b10c258 (diff) | |
| download | wireshark-b591f07273f4e055a286ca36b6fda5da99952b5d.tar.gz | |
SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error.
In value string table "smb2_ioctl_vals[]" of packet-smb2.c
{0x0011C017, "FSCTL_PIPE_TRANSCEIVE" } was placed before
{0x00110018, "FSCTL_PIPE_WAIT"}
which causes "Extended value string 'smb2_ioctl_vals[]' forced to fall back
to linear search: entry , value 0x00110018 < previous entry, value
0x0011C017"
Change-Id: I99afe5aa12c031e90bb0bd4c8e8aadfffad0135d
Reviewed-on: https://code.wireshark.org/review/9449
Reviewed-by: Cal Turney <cturney@charter.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 6b86e886c8..9620f15564 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -1329,8 +1329,13 @@ static const value_string smb2_ioctl_vals[] = { {0x0009C040, "FSCTL_SET_COMPRESSION"}, /* dissector implemented */ {0x0009C280, "FSCTL_SET_INTEGRITY_INFORMATION"}, {0x00110018, "FSCTL_PIPE_WAIT"}, +<<<<<<< HEAD {0x0011C017, "FSCTL_PIPE_TRANSCEIVE"}, /* dissector implemented */ {0x00140078, "FSCTL_SRV_REQUEST_RESUME_KEY"}, +======= + {0x0011C017, "FSCTL_PIPE_TRANSCEIVE" }, /* dissector implemented */ + {0x00140078, "FSCTL_SRV_REQUEST_RESUME_KEY" }, +>>>>>>> 24a7720... SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error. {0x001401D4, "FSCTL_LMR_REQUEST_RESILIENCY"}, /* dissector implemented */ {0x001401FC, "FSCTL_QUERY_NETWORK_INTERFACE_INFO"}, /* dissector implemented */ {0x00140200, "FSCTL_VALIDATE_NEGOTIATE_INFO_224"}, /* dissector implemented */ |