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

If we don't have more than 5 bytes in the message, don't put an entry in 

the tree for an optional parameter pointer, as there isn't one.

svn path=/trunk/; revision=12135
This commit is contained in:
Guy Harris 2004-09-29 10:09:04 +00:00
parent 649ecd7e8c
commit 7bc922cf39
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
epan/dissectors/packet-etheric.c
View File

@ -1220,19 +1220,16 @@ dissect_etheric_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *e
/* extract pointer to start of optional part (if any) */
if (opt_part_possible == TRUE){
if (message_length > 5 )
if (message_length > 5 ) {
opt_parameter_pointer = tvb_get_guint8(message_tvb, offset);
if (opt_parameter_pointer > 0){
proto_tree_add_uint_format(etheric_tree, hf_etheric_pointer_to_start_of_optional_part,
message_tvb, offset, 1, opt_parameter_pointer, "Pointer to start of optional part: %u", opt_parameter_pointer);
offset += opt_parameter_pointer;
optional_parameter_tvb = tvb_new_subset(message_tvb, offset, -1, -1 );
dissect_etheric_optional_parameter(optional_parameter_tvb, pinfo, etheric_tree);
}else{
proto_tree_add_uint_format(etheric_tree, hf_etheric_pointer_to_start_of_optional_part,
message_tvb, offset, 1, opt_parameter_pointer, "No optional parameter present (Pointer: %u)",
opt_parameter_pointer);
offset += opt_parameter_pointer;
if (opt_parameter_pointer > 0){
optional_parameter_tvb = tvb_new_subset(message_tvb, offset, -1, -1 );
dissect_etheric_optional_parameter(optional_parameter_tvb, pinfo, etheric_tree);
}
}
}
else if (message_type !=ETHERIC_MESSAGE_TYPE_CHARGE_INFO)