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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7859 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 5 insertions, 5 deletions

diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index e7727303e2..13bae87b1e 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -3,7 +3,7 @@
  * By Steve Limkemann <stevelim@dgtech.com>
  * Copyright 1998 Steve Limkemann
  *
- * $Id: packet-gryphon.c,v 1.36 2003/04/30 02:35:25 gerald Exp $
+ * $Id: packet-gryphon.c,v 1.37 2003/06/12 08:33:32 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1537,16 +1537,16 @@ resp_list(tvbuff_t *tvb, int offset, proto_tree *pt)
     return offset;
 }
 
-#define GRYPHON_CMD_START_STR_LEN 120
 static int
 cmd_start(tvbuff_t *tvb, int offset, proto_tree *pt)
 {
-    char	    string[GRYPHON_CMD_START_STR_LEN];
+    char	    *string;
     gint	    length;
 
-    offset = cmd_delete(tvb, offset, pt);
-    length = tvb_get_nstringz0(tvb, offset, GRYPHON_CMD_START_STR_LEN, string) + 1;
+    offset = cmd_delete(tvb, offset, pt);	/* decode the name */
+    string = tvb_get_stringz(tvb, offset, &length);
     proto_tree_add_text(pt, tvb, offset, length, "Arguments: %s", string);
+    g_free(string);
     offset += length;
     length = 3 - (length + 3) % 4;
     if (length) {