diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-04-21 00:47:55 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-04-21 00:47:55 +0000 |
| commit | d43e7474f456b4aaea8e894049a8d0b08503f4fe (patch) | |
| tree | fea4c614aa40104bf9f2d81a9953a1f22cc067b2 /epan/dissectors/x11-register-info.h | |
| parent | c705b3bc881e0944415eec24b9669b221aed58ba (diff) | |
From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4701 :
The ChangeProperty request always calls LISTofBYTE, which always tries to
dissect at least one byte, even when the request is empty. This causes
Wireshark to put a big, red, scary "Malformed Packet" entry in the dissection.
Also, ChangeProperty only dissects (data_length) bytes. data_length is "number
of units", and units may be 16 or 32-bit entities. In this case, the dissected
data will be truncated.
First reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481#c10
The attached patch fixes these two bugs.
svn path=/trunk/; revision=32526
Diffstat (limited to 'epan/dissectors/x11-register-info.h')
| -rw-r--r-- | epan/dissectors/x11-register-info.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/x11-register-info.h b/epan/dissectors/x11-register-info.h index 377fe759d8..4d1dc2f493 100644 --- a/epan/dissectors/x11-register-info.h +++ b/epan/dissectors/x11-register-info.h @@ -171,6 +171,10 @@ { &hf_x11_green, { "green", "x11.green", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_greens, { "greens", "x11.greens", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_data, { "data", "x11.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_data16, { "data16", "x11.data16", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_data16_item, { "item", "x11.data16.item", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, +{ &hf_x11_data32, { "data32", "x11.data32", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, +{ &hf_x11_data32_item, { "item", "x11.data32.item", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_x11_data_length, { "data-length", "x11.data-length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }}, { &hf_x11_delete, { "delete", "x11.delete", FT_BOOLEAN, BASE_NONE, NULL, 0, "Delete this property after reading", HFILL }}, { &hf_x11_delta, { "delta", "x11.delta", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }}, |