osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

some more tcv_get_stringz() to tvb_get_ephemeral_stringz() conversions 

svn path=/trunk/; revision=15288
This commit is contained in:
Ronnie Sahlberg 2005-08-11 07:44:38 +00:00
parent d510893a5c
commit e3a0e74e8d
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-smpp.c
View File

@ -803,11 +803,10 @@ smpp_handle_string_return(proto_tree *tree, tvbuff_t *tvb, int field, int *offse
len = tvb_strsize(tvb, *offset);
if (len > 1) {
str = (char *)tvb_get_stringz(tvb, *offset, &len);
str = (char *)tvb_get_ephemeral_stringz(tvb, *offset, &len);
proto_tree_add_string(tree, field, tvb, *offset, len, str);
} else {
str = g_malloc(1 * sizeof(char));
str[0] = '\0';
str = "";
}
(*offset) += len;
return str;
@ -867,7 +866,7 @@ smpp_handle_time(proto_tree *tree, tvbuff_t *tvb,
gint len;
nstime_t tmptime;
strval = (char *) tvb_get_stringz(tvb, *offset, &len);
strval = (char *) tvb_get_ephemeral_stringz(tvb, *offset, &len);
if (*strval)
{
if (smpp_mktime(strval, &tmptime.secs, &tmptime.nsecs))
@ -875,7 +874,6 @@ smpp_handle_time(proto_tree *tree, tvbuff_t *tvb,
else
proto_tree_add_time(tree, field, tvb, *offset, len, &tmptime);
}
g_free(strval);
*offset += len;
}
@ -1411,8 +1409,6 @@ submit_sm(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
offset += length;
}
/* Get rid of SMPP text string addresses */
g_free(src_str);
g_free(dst_str);
smpp_handle_tlv(tree, tvb, &offset);
}

8
epan/dissectors/packet-wsp.c
View File

@ -1783,17 +1783,16 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo)
offset += 2;
} else if (hdr_id >= 0x20) { /* Textual header */
/* Header name MUST be NUL-ended string ==> tvb_get_stringz() */
hdr_str = (gchar *)tvb_get_stringz(tvb, hdr_start, (gint *)&hdr_len);
hdr_str = (gchar *)tvb_get_ephemeral_stringz(tvb, hdr_start, (gint *)&hdr_len);
val_start = hdr_start + hdr_len;
val_id = tvb_get_guint8(tvb, val_start);
/* Call header value dissector for given header */
if (val_id >= 0x20 && val_id <=0x7E) { /* OK! */
val_str = (gchar *)tvb_get_stringz(tvb, val_start, (gint *)&val_len);
val_str = (gchar *)tvb_get_ephemeral_stringz(tvb, val_start, (gint *)&val_len);
offset = val_start + val_len;
tvb_ensure_bytes_exist(tvb, hdr_start, offset-hdr_start);
proto_tree_add_text(wsp_headers,tvb,hdr_start,offset-hdr_start,
"%s: %s", hdr_str, val_str);
g_free (val_str);
} else {
/* Old-style X-WAP-TOD uses a non-textual value
* after a textual header. */
@ -1909,7 +1908,7 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo)
#define wkh_2_TextualValue /* Parse Textual Value */ \
/* END */ \
} else if ((val_id == 0) || (val_id >= 0x20)) { /* Textual value */ \
val_str = (gchar *)tvb_get_stringz (tvb, val_start, (gint *)&val_len); \
val_str = (gchar *)tvb_get_ephemeral_stringz (tvb, val_start, (gint *)&val_len); \
offset = val_start + val_len; \
/* Textual value processing starts HERE \
* \
@ -1917,7 +1916,6 @@ add_headers (proto_tree *tree, tvbuff_t *tvb, int hf, packet_info *pinfo)
#define wkh_3_ValueWithLength /* Parse Value With Length */ \
/* END */ \
g_free(val_str); \
} else { /* val_start points to 1st byte of length field */ \
if (val_id == 0x1F) { /* Value Length = guintvar */ \
val_len = tvb_get_guintvar(tvb, val_start + 1, &val_len_len); \