diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-28 10:05:37 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-28 10:05:37 +0000 |
| commit | a2142fd8f11a82a25d421a495ce1eced281110b5 (patch) | |
| tree | 383caec0696a4ba18ba84be637b6ffba1c2ae833 | |
| parent | df2d1d3f22347fcbcb37783355fcd1589f99b019 (diff) | |
more emeification of tvb_get_string()
svn path=/trunk/; revision=15133
| -rw-r--r-- | epan/dissectors/packet-sipfrag.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/packet-wsp.c | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c index c40bfaf89f..b548ae5f49 100644 --- a/epan/dissectors/packet-sipfrag.c +++ b/epan/dissectors/packet-sipfrag.c @@ -79,7 +79,7 @@ dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* For now, add all lines as unparsed strings */ /* Extract & add the string. */ - string = tvb_get_string(tvb, offset, linelen); + string = ep_tvb_get_string(tvb, offset, linelen); proto_tree_add_string_format(sipfrag_tree, hf_line, tvb, offset, linelen, string, @@ -91,9 +91,6 @@ dissect_sipfrag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_append_fstr(pinfo->cinfo, COL_INFO, "(%s", string); } - /* Finished with this string now. */ - g_free(string); - /* Move onto next line. */ offset = next_offset; } diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c index 11bd53e5e2..b146439b11 100644 --- a/epan/dissectors/packet-wsp.c +++ b/epan/dissectors/packet-wsp.c @@ -1277,7 +1277,7 @@ static void add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *p get_integer_value(val,tvb,start,len,ok) /* NOTE - Don't forget to g_free() the str value after its usage as the - * tvb_get_string[z]() functions return g_malloc()ed memory! */ + * tvb_get_stringz() functions return g_malloc()ed memory! */ #define get_text_string(str,tvb,start,len,ok) \ if (is_text_string(tvb_get_guint8(tvb,start))) { \ str = (gchar *)tvb_get_stringz(tvb,start,(gint *)&len); \ @@ -5894,7 +5894,7 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v char *variableBuffer; char *valueBuffer; - variableBuffer = tvb_get_string(tvb, variableStart, variableLength); + variableBuffer = ep_tvb_get_string(tvb, variableStart, variableLength); if (valueEnd < valueStart) { @@ -5907,7 +5907,7 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v valueLength = valueEnd-valueStart; /* XXX - if this throws an exception, "variableBuffer" is leaked */ - valueBuffer = tvb_get_string(tvb, valueStart, valueLength); + valueBuffer = ep_tvb_get_string(tvb, valueStart, valueLength); } /* Check for variables with no value */ @@ -5920,8 +5920,6 @@ add_post_variable (proto_tree *tree, tvbuff_t *tvb, guint variableStart, guint v proto_tree_add_text (tree, tvb, variableStart, valueEnd-variableStart, "%s: %s", variableBuffer, valueBuffer); - g_free (variableBuffer); - g_free (valueBuffer); } static void |