diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-12 03:35:14 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-12 03:35:14 +0000 |
| commit | 2214faa7f34a940113fa6604784b6c7158421948 (patch) | |
| tree | c23500dad6cfef6574206b98c5b54fc712890d31 /epan/dissectors/packet-dcerpc-rpriv.c | |
| parent | b6542d17d8d4414c86c547b675951e924f552948 (diff) | |
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_string(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s.
In a couple of places an hf variable was being used as the length in a call to
proto_tree_add_*(). Use the appropriate variable instead.
svn path=/trunk/; revision=35497
Diffstat (limited to 'epan/dissectors/packet-dcerpc-rpriv.c')
| -rw-r--r-- | epan/dissectors/packet-dcerpc-rpriv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c index 4137288060..b99339db80 100644 --- a/epan/dissectors/packet-dcerpc-rpriv.c +++ b/epan/dissectors/packet-dcerpc-rpriv.c @@ -69,7 +69,7 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, * unsigned32 num_bytes; * [size_is(num_bytes)] * byte bytes[]; - */ + */ guint32 authn_svc, authz_svc, key_size, key_size2, var1; const char *key_t1 = NULL; @@ -82,14 +82,14 @@ rpriv_dissect_get_eptgt_rqst (tvbuff_t *tvb, int offset, offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rpriv_get_eptgt_rqst_key_size2, &key_size); /* advance to get size of cell, and princ */ - proto_tree_add_string (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, hf_rpriv_get_eptgt_rqst_key_size, tvb_get_ptr (tvb, offset, key_size)); - key_t1 = (const char *)tvb_get_ptr(tvb,offset,key_size); + proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t, tvb, offset, key_size, ENC_NA); + key_t1 = tvb_get_ephemeral_string(tvb, offset, key_size); offset += key_size; offset += 8; offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_rpriv_get_eptgt_rqst_key_size2, &key_size2); - proto_tree_add_string (tree, hf_rpriv_get_eptgt_rqst_key_t2, tvb, offset, hf_rpriv_get_eptgt_rqst_key_size2, tvb_get_ptr (tvb, offset, key_size2)); - key_t2 = (const char *)tvb_get_ptr(tvb,offset,key_size2); + proto_tree_add_item (tree, hf_rpriv_get_eptgt_rqst_key_t2, tvb, offset, key_size2, ENC_NA); + key_t2 = tvb_get_ephemeral_string(tvb, offset, key_size2); offset += key_size2; @@ -131,7 +131,7 @@ proto_register_rpriv (void) { "Key_t", "rpriv.get_eptgt_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_rpriv_get_eptgt_rqst_key_t2, { "Key_t2", "rpriv.get_eptgt_rqst_key_t2", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, - + }; static gint *ett[] = { |