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

packet-x11.c: Sanity check BIG-REQUEST length 

Bug: 13793
Change-Id: I8863da14f889c68d161f4e53aa6a4e0d2636ba48
Reviewed-on: https://code.wireshark.org/review/22140
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:
Michael Mann 2017-06-14 11:44:26 -04:00 committed by Anders Broman
parent 01fe854fa0
commit acb488b7f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-x11.c
View File

@ -4919,15 +4919,15 @@ static void dissect_x11_requests(tvbuff_t *tvb, packet_info *pinfo,
plen = tvb_get_guint32(tvb, offset + 4, byte_order);
}
if (plen == 0) {
if (plen <= 0) {
/*
* This can't be 0, as it includes the header length.
* This can't be less then 0, as it includes the header length.
* A different choice of byte order wouldn't have
* helped.
* Give up.
*/
ti = proto_tree_add_item(tree, proto_x11, tvb, offset, -1, ENC_NA);
expert_add_info_format(pinfo, ti, &ei_x11_request_length, "Bogus request length (0)");
expert_add_info_format(pinfo, ti, &ei_x11_request_length, "Bogus request length (%d)", plen);
return;
}