diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 03:29:03 +0000 |
| commit | 067a0761790aabf2d6a829c59dbdac4c2d0fccdf (patch) | |
| tree | ee4e7efac0f2d4a12f25d92b0b1fd222f1e47587 /epan/dissectors/packet-dcerpc-rs_pgo.c | |
| parent | 1f19cd8f1b95aa5cfef763d266724e01a1c579e2 (diff) | |
Use tvb_ip_to_str().
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
svn path=/trunk/; revision=35545
Diffstat (limited to 'epan/dissectors/packet-dcerpc-rs_pgo.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-rs_pgo.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c index f653a97ef6..5bf79bbc83 100644 --- a/epan/dissectors/packet-dcerpc-rs_pgo.c +++ b/epan/dissectors/packet-dcerpc-rs_pgo.c @@ -183,7 +183,6 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In typedef [string] char sec_rgy_pname_t[sec_rgy_pname_t_size]; */ guint32 string_size; - const guint8 *namestring; dcerpc_info *di; di = pinfo->private_data; @@ -200,25 +199,21 @@ dissect sec_rgy_pname const signed32 sec_rgy_pname_t_size = 257; * In tree = proto_item_add_subtree (item, ett_sec_rgy_pname_t); } - offset = - dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, - hf_sec_rgy_pname_t_size, &string_size); + offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, + hf_sec_rgy_pname_t_size, &string_size); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " String_size:%u", string_size); if (string_size < sec_rgy_pname_t_size) { /* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */ - proto_tree_add_string (tree, hf_sec_rgy_pname_t_principalName_string, - tvb, offset, string_size, tvb_get_ptr (tvb, - offset, - string_size)); + proto_tree_add_item (tree, hf_sec_rgy_pname_t_principalName_string, + tvb, offset, string_size, ENC_NA); if (string_size > 1) { - namestring = tvb_get_ptr (tvb, offset, string_size); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - namestring); + tvb_get_ephemeral_string(tvb, offset, string_size)); } offset += string_size; } @@ -409,7 +404,6 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, #define sec_rgy_name_t_size 1025 /* typedef [string] char sec_rgy_name_t[sec_rgy_name_t_size]; */ guint32 string_size; - const guint8 *namestring; dcerpc_info *di; di = pinfo->private_data; @@ -435,16 +429,13 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset, { /* proto_tree_add_string(tree, id, tvb, start, length, value_ptr); */ - proto_tree_add_string (tree, hf_sec_rgy_name_t_principalName_string, - tvb, offset, string_size, tvb_get_ptr (tvb, - offset, - string_size)); + proto_tree_add_item (tree, hf_sec_rgy_name_t_principalName_string, + tvb, offset, string_size, ENC_NA); if (string_size > 1) { - namestring = tvb_get_ptr (tvb, offset, string_size); if (check_col (pinfo->cinfo, COL_INFO)) col_append_fstr (pinfo->cinfo, COL_INFO, " Principal:%s", - namestring); + tvb_get_ephemeral_string (tvb, offset, string_size)); } offset += string_size; } |