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

Diameter 3gpp: When checking if text ignore padding or NULL termination. 

Change-Id: Ic8eac664e2537d0e85afb5cab80e2621407d2c79
Reviewed-on: https://code.wireshark.org/review/36253
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Anders Broman 2020-03-02 15:13:00 +01:00 committed by Anders Broman
parent 7322c35a47
commit 8877fa2301
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-diameter_3gpp.c
View File

@ -750,18 +750,24 @@ dissect_diameter_3gpp_af_application_identifier(tvbuff_t *tvb, packet_info *pinf
proto_item *item;
int offset = 0;
int length = tvb_reported_length(tvb);
int new_len, start_len = length;
diam_sub_dis_t *diam_sub_dis = (diam_sub_dis_t*)data;
guint8 tempchar;
if (tree){
if (!tvb_ascii_isprint(tvb, 0, length))
return length;
/* Skipp NULL trermination and/or padding at the end */
for (new_len = length; new_len > start_len - 4 &&
((tempchar = tvb_get_guint8(tvb, new_len - 1)) == 0); new_len--);
item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_af_application_identifier, tvb, offset, length,
ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str);
proto_item_set_generated(item);
}
length = new_len;
return length;
if (!tvb_ascii_isprint(tvb, 0, length))
return start_len;
item = proto_tree_add_item_ret_string(tree, hf_diameter_3gpp_af_application_identifier, tvb, offset, length,
ENC_UTF_8 | ENC_NA, wmem_packet_scope(), (const guint8**)&diam_sub_dis->avp_str);
proto_item_set_generated(item);
return start_len;
}
/*