osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix the infinite-loop fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6962 :

Browse source 
Repeat r41359 in another location:

Don't try to display tone entries if there are none (but there is length for
them).  Could/should be an expert_info.

Also fix a typo: Nomber->Number.

svn path=/trunk/; revision=41639
This commit is contained in:
Jeff Morriss 2012-03-18 14:05:45 +00:00
parent c49205ed0f
commit 4906ffcdfe
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-ua3g.c
View file

@ -1145,11 +1145,11 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
tone_nb_entries = tvb_get_guint8(tvb, offset);
proto_tree_add_text(ua3g_body_tree, tvb, offset, 1, "Nomber Of Entries: %d", tone_nb_entries);
proto_tree_add_text(ua3g_body_tree, tvb, offset, 1, "Number Of Entries: %d", tone_nb_entries);
offset++;
length--;
while(length > 0) {
while(length > 0 && tone_nb_entries) {
for(i = 1; i <= tone_nb_entries; i++) {
frequency_1 = tvb_get_ntohs(tvb, offset);
level_1 = (signed char)(tvb_get_guint8(tvb, offset + 2)) / 2;
@ -1197,7 +1197,7 @@ decode_ip_device_routing(proto_tree *tree _U_, tvbuff_t *tvb, packet_info *pinfo
tone_nb_entries = tvb_get_guint8(tvb, offset);
proto_tree_add_text(ua3g_body_tree, tvb, offset, 1,
"Direction: %s - Nomber Of Entries: %d",
"Direction: %s - Number Of Entries: %d",
val_to_str(tone_direction, str_tone_direction, "Unknown"), tone_nb_entries);
offset++;
length--;