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

Fix some benign bugs in proto_tree_add_item() 'encoding' arg. 

svn path=/trunk/; revision=39345
This commit is contained in:
Bill Meier 2011-10-10 21:12:05 +00:00
parent e81572eaa9
commit 8960630a3c
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1461,11 +1461,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
hf_smpp_receipted_message_id, offset); hf_smpp_receipted_message_id, offset);
break; break;
case 0x0030: /* ms_msg_wait_facilities */ case 0x0030: /* ms_msg_wait_facilities */
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_msg_wait_ind, proto_tree_add_item(sub_tree, hf_smpp_msg_wait_ind,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_msg_wait_type, proto_tree_add_item(sub_tree, hf_smpp_msg_wait_type,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;
case 0x0201: /* privacy_indicator */ case 0x0201: /* privacy_indicator */
@ -1528,11 +1527,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
(*offset)++; (*offset)++;
break; break;
case 0x0302: /* callback_num_pres_ind */ case 0x0302: /* callback_num_pres_ind */
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_callback_num_pres, proto_tree_add_item(sub_tree, hf_smpp_callback_num_pres,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_callback_num_scrn, proto_tree_add_item(sub_tree, hf_smpp_callback_num_scrn,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;
case 0x0303: /* callback_num_atag */ case 0x0303: /* callback_num_atag */
@ -1729,11 +1727,10 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset)
case 0x1383: /* its_session_info */ case 0x1383: /* its_session_info */
smpp_handle_int1(sub_tree, tvb, smpp_handle_int1(sub_tree, tvb,
hf_smpp_its_session_number, offset); hf_smpp_its_session_number, offset);
field = tvb_get_guint8(tvb, *offset);
proto_tree_add_item(sub_tree, hf_smpp_its_session_sequence, proto_tree_add_item(sub_tree, hf_smpp_its_session_sequence,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
proto_tree_add_item(sub_tree, hf_smpp_its_session_ind, proto_tree_add_item(sub_tree, hf_smpp_its_session_ind,
tvb, *offset, 1, field); tvb, *offset, 1, ENC_NA);
(*offset)++; (*offset)++;
break; break;