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-declarations.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-declarations.h')
| -rw-r--r-- | epan/dissectors/x11-declarations.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/x11-declarations.h b/epan/dissectors/x11-declarations.h index 6168b35b00..c448c6a064 100644 --- a/epan/dissectors/x11-declarations.h +++ b/epan/dissectors/x11-declarations.h @@ -171,6 +171,10 @@ static int hf_x11_gc_value_mask_arc_mode = -1; static int hf_x11_green = -1; static int hf_x11_greens = -1; static int hf_x11_data = -1; +static int hf_x11_data16 = -1; +static int hf_x11_data16_item = -1; +static int hf_x11_data32 = -1; +static int hf_x11_data32_item = -1; static int hf_x11_data_length = -1; static int hf_x11_delete = -1; static int hf_x11_delta = -1; |