osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

BT-DHT: Exit a loop. 

Always make sure our offset advances in dissect_bencoded_list.
Fixes #17651.
This commit is contained in:
Gerald Combs 2021-10-11 13:00:50 -07:00 committed by Wireshark GitLab Utility
parent 643fbe52ae
commit ed98abe208
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-bt-dht.c
View File

@ -184,6 +184,7 @@ dissect_bencoded_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
offset += 1;
while( (one_byte=tvb_get_guint8(tvb,offset)) != 'e' )
{
guint start_offset = offset;
switch( one_byte )
{
/* a integer */
@ -201,14 +202,14 @@ dissect_bencoded_list(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
/* a string */
default:
offset = dissect_bencoded_string( tvb, pinfo, sub_tree, offset, &result, FALSE, "String" );
if (offset == 0)
{
proto_tree_add_expert(sub_tree, pinfo, &ei_int_string, tvb, offset, -1);
/* if offset is not going on, there is no chance to exit the loop, then return*/
return 0;
}
break;
}
if (offset <= start_offset)
{
proto_tree_add_expert(sub_tree, pinfo, &ei_int_string, tvb, offset, -1);
/* if offset is not going on, there is no chance to exit the loop, then return*/
return 0;
}
}
proto_tree_add_item(sub_tree, hf_bencoded_list_terminator, tvb, offset, 1, ENC_ASCII|ENC_NA);
offset += 1;