Add new routines:

	tvb_get_string() - takes a tvbuff, an offset, and a length as
	arguments, allocates a buffer big enough to hold a string with
	the specified number of bytes plus an added null terminator
	(i.e., length+1), copies the specified number of bytes from the
	tvbuff, at the specified offset, to that buffer and puts in a
	null terminator, and returns a pointer to that buffer (or throws
	an exception before allocating the buffer if that many bytes
	aren't available in the tvbuff);

	tvb_get_stringz() - takes a tvbuff, an offset, and a pointer to
	a "gint" as arguments, gets the size of the null-terminated
	string starting at the specified offset in the tvbuff (throwing
	an exception if the null terminator isn't found), allocates a
	buffer big enough to hold that string, copies the string to that
	buffer, and returns a pointer to that buffer and stores the
	length of the string (including the terminating null) in the
	variable pointed to by the "gint" pointer.

Replace many pieces of code allocating a buffer and copying a string
with calls to "tvb_get_string()" (for one thing, "tvb_get_string()"
doesn't require you to remember that the argument to
"tvb_get_nstringz0()" is the size of the buffer into which you're
copying the string, which might be the length of the string to be copied
*plus 1*).

Don't use fixed-length buffers for null-terminated strings (even if the
code that generates those packets has a #define to limit the length of
the string).  Use "tvb_get_stringz()", instead.

In some cases where a value is fetched but is only used to pass an
argument to a "proto_tree_add_XXX" routine, use "proto_tree_add_item()"
instead.

svn path=/trunk/; revision=7859

1 files changed, 3 insertions, 7 deletions

diff --git a/packet-sip.c b/packet-sip.c
index 6cee21d410..fac7985964 100644
--- a/packet-sip.c
+++ b/packet-sip.c
@@ -17,7 +17,7 @@
  * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
  * Copyright 2001, Jean-Francois Mule <jfm@cablelabs.com>
  *
- * $Id: packet-sip.c,v 1.38 2003/06/11 21:17:41 guy Exp $
+ * $Id: packet-sip.c,v 1.39 2003/06/12 08:33:29 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -443,10 +443,8 @@ dissect_sip_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 					 * Fetch the value.
 					 */
 					value_len = line_end_offset - value_offset;
-					value = g_malloc(value_len + 1);
-					tvb_memcpy(tvb, value, value_offset,
+					value = tvb_get_string(tvb, value_offset,
 					    value_len);
-					value[value_len] = '\0';
 
 					/*
 					 * Add it to the protocol tree,
@@ -489,9 +487,7 @@ void dfilter_sip_request_line(tvbuff_t *tvb, proto_tree *tree, guint meth_len)
          * We know we have the entire method; otherwise, "sip_parse_line()"
          * would have returned OTHER_LINE.
          */
-	string = g_malloc(meth_len + 1);
-        tvb_memcpy(tvb, (guint8 *)string, 0, meth_len);
-        string[meth_len] = '\0';
+        string = tvb_get_string(tvb, 0, meth_len);
         proto_tree_add_string(tree, hf_Method, tvb, 0, meth_len, string);
         g_free(string);
 }