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

3 files changed, 23 insertions, 24 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[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index 7083ad6fbd..381d847e11 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -4,7 +4,7 @@
  * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_acct.idl
- *      
+ *
  * $Id$
  *
  * Wireshark - Network traffic analyzer
@@ -65,14 +65,14 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset,
 	guint32 key_size;
 	const char *keyx_t = NULL;
 
-	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_rs_acct_lookup_rqst_var, NULL);
-	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			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_string (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, hf_rs_acct_lookup_rqst_key_size, tvb_get_ptr (tvb, offset, key_size));
-		keyx_t = (const char *)tvb_get_ptr(tvb,offset,key_size);
+		proto_tree_add_item (tree, hf_rs_acct_lookup_rqst_key_t, tvb, offset, key_size, ENC_NA);
+		keyx_t = tvb_get_ephemeral_string(tvb, offset, key_size);
 		offset += key_size;
 
 		if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -80,7 +80,7 @@ rs_acct_dissect_lookup_rqst (tvbuff_t *tvb, int offset,
 				" Request for: %s ", keyx_t);
 		}
 	} else {
-		col_append_str(pinfo->cinfo, COL_INFO, 
+		col_append_str(pinfo->cinfo, COL_INFO,
 				" Request (other)");
 	}
 
@@ -96,19 +96,18 @@ rs_acct_dissect_get_projlist_rqst (tvbuff_t *tvb, int offset,
 	guint32 key_size;
 	const char *keyx_t = NULL;
 
-	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_rs_acct_get_projlist_rqst_var1, NULL);
-	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_rs_acct_get_projlist_rqst_key_size, &key_size);
 
-	proto_tree_add_string (tree, hf_rs_acct_get_projlist_rqst_key_t, 
-			tvb, offset, hf_rs_acct_get_projlist_rqst_key_size, 
-			tvb_get_ptr (tvb, offset, key_size));
-	keyx_t = (const char *)tvb_get_ptr(tvb,offset,key_size);
+	proto_tree_add_item (tree, hf_rs_acct_get_projlist_rqst_key_t,
+			     tvb, offset, key_size, ENC_NA);
+	keyx_t = tvb_get_ephemeral_string(tvb, offset, key_size);
 	offset += key_size;
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, 
+		col_append_fstr(pinfo->cinfo, COL_INFO,
 			" Request for: %s", keyx_t);
 	}
 
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 6d2f446926..531aee648c 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -4,7 +4,7 @@
  * Copyright 2002, Jaime Fournier <Jaime.Fournier@hush.com>
  * This information is based off the released idl files from opengroup.
  * ftp://ftp.opengroup.org/pub/dce122/dce/src/security.tar.gz security/idl/rs_misc.idl
- *      
+ *
  * $Id$
  *
  * Wireshark - Network traffic analyzer
@@ -62,15 +62,15 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
 	guint32 key_size;
 	const char *key_t1 = NULL;
 
-	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, 
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_rs_misc_login_get_info_rqst_var, NULL);
 	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
 			hf_rs_misc_login_get_info_rqst_key_size, &key_size);
 
 	if (key_size){ /* Not able to yet decipher the OTHER versions of this call just yet. */
 
-		proto_tree_add_string (tree, hf_rs_misc_login_get_info_rqst_key_t, tvb, offset, hf_rs_misc_login_get_info_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_rs_misc_login_get_info_rqst_key_t, tvb, offset, key_size, ENC_NA);
+		key_t1 = tvb_get_ephemeral_string(tvb, offset, key_size);
 		offset += key_size;
 
 		if (check_col(pinfo->cinfo, COL_INFO)) {
@@ -78,7 +78,7 @@ rs_misc_dissect_login_get_info_rqst (tvbuff_t *tvb, int offset,
 				"rs_login_get_info Request for: %s ", key_t1);
 		}
 	} else {
-		col_append_str(pinfo->cinfo, COL_INFO, 
+		col_append_str(pinfo->cinfo, COL_INFO,
 				"rs_login_get_info Request (other)");
 	}