aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dcerpc-rs_acct.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-dcerpc-rs_acct.c')
-rw-r--r--epan/dissectors/packet-dcerpc-rs_acct.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index 24d1f92688..f9c2d4591c 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -56,7 +56,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
{
guint32 key_size;
- const char *keyx_t = NULL;
+ const guint8 *keyx_t = NULL;
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
hf_rs_acct_lookup_rqst_var, NULL);
@@ -64,8 +64,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset,
hf_rs_acct_lookup_rqst_key_size, &key_size);
if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
- proto_tree_add_item (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA);
- keyx_t = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII);
+ proto_tree_add_item_ret_string(tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_ASCII|ENC_NA, wmem_packet_scope(), &keyx_t);
offset += key_size;
col_append_fstr(pinfo->cinfo, COL_INFO,
@@ -85,16 +84,15 @@ rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree, dcerpc_info *di, guint8 *drep)
{
guint32 key_size;
- const char *keyx_t = NULL;
+ const guint8 *keyx_t = NULL;
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
hf_rs_acct_get_projlist_rqst_var1, NULL);
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep,
hf_rs_acct_get_projlist_rqst_key_size, &key_size);
- proto_tree_add_item (tree, hf_rs_acct_get_projlist_rqst_key_t,
- tvb, offset, key_size, ENC_ASCII|ENC_NA);
- keyx_t = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, key_size, ENC_ASCII);
+ proto_tree_add_item_ret_string(tree, hf_rs_acct_get_projlist_rqst_key_t,
+ tvb, offset, key_size, ENC_ASCII|ENC_NA, wmem_packet_scope(), &keyx_t);
offset += key_size;
col_append_fstr(pinfo->cinfo, COL_INFO,