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

Replace some tvb_get_ptr calls. 

Change-Id: I640fd7c96c421bb7862021405cdb7a2c255ced21
Reviewed-on: https://code.wireshark.org/review/15473
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-05-16 22:21:39 -04:00
parent 3f48ef41c3
commit 988ac360cd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-icmpv6.c
View File

@ -2737,7 +2737,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
while (num_of_addr--) {
memset(addr, 0, sizeof(addr));
memcpy(addr + compr, tvb_get_ptr(tvb, opt_offset, addr_len), addr_len);
tvb_memcpy(tvb, addr + compr, opt_offset, addr_len);
proto_tree_add_ipv6(flag_tree, hf_icmpv6_rpl_opt_route_discovery_addr_vec_addr, tvb, opt_offset, addr_len, (struct e_in6_addr *)addr);
opt_offset += addr_len;
}

16
epan/dissectors/packet-netrom.c
View File

@ -451,23 +451,23 @@ static void
dissect_netrom_routing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
tvbuff_t *next_tvb;
const guint8* mnemonic;
gint mnemonic_len;
col_set_str( pinfo->cinfo, COL_PROTOCOL, "NET/ROM");
col_set_str( pinfo->cinfo, COL_INFO, "routing table frame");
if (tree)
{
{
proto_item *ti;
proto_tree *netrom_tree;
ti = proto_tree_add_protocol_format( tree, proto_netrom, tvb, 0, -1,
"NET/ROM, routing table frame, Node: %.6s",
tvb_get_ptr( tvb, 1, 6 )
);
ti = proto_tree_add_item( tree, proto_netrom, tvb, 0, -1, ENC_NA);
netrom_tree = proto_item_add_subtree( ti, ett_netrom );
proto_tree_add_item( netrom_tree, hf_netrom_mnemonic, tvb, 1, 6, ENC_ASCII|ENC_NA );
}
proto_tree_add_item_ret_string_and_length(netrom_tree, hf_netrom_mnemonic, tvb, 1, 6, ENC_ASCII|ENC_NA,
wmem_packet_scope(), &mnemonic, &mnemonic_len);
proto_item_append_text(ti, ", routing table frame, Node: %.6s", mnemonic);
}
next_tvb = tvb_new_subset_remaining(tvb, 7);