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

fix subtle g_strdup_printf() memory leaks with ephemeral memory 

svn path=/trunk/; revision=44491
This commit is contained in:
Michael Mann 2012-08-14 16:29:38 +00:00
parent c7a6af44bb
commit 4108285179
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ajp13.c
View File

@ -733,7 +733,7 @@ display_req_forward(tvbuff_t *tvb, packet_info *pinfo,
if (ajp13_tree) {
proto_tree_add_string_format(ajp13_tree, hf_ajp13_req_attribute,
tvb, apos, 1+aname_len+2+aval_len+2,
g_strdup_printf("%s: %s", aname, aval),
ep_strdup_printf("%s: %s", aname, aval),
"%s: %s", aname, aval);
}
} else if (aid == 0x0B ) {

4
epan/dissectors/packet-fclctl.c
View File

@ -131,13 +131,13 @@ const gchar *
fclctl_get_paramstr (guint32 linkctl_type, guint32 param)
{
if (linkctl_type == FC_LCTL_PBSY) {
return g_strdup_printf("%s, %s",
return ep_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_pbsy_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_pbsy_rjt_val, "0x%x"));
}
if ((linkctl_type == FC_LCTL_FRJT) ||
(linkctl_type == FC_LCTL_PRJT)) {
return g_strdup_printf("%s, %s",
return ep_strdup_printf("%s, %s",
val_to_str (((param & 0xFF000000) >> 24), fc_lctl_rjt_acode_val, "0x%x"),
val_to_str (((param & 0x00FF0000) >> 16), fc_lctl_rjt_val, "%x"));
}

4
epan/dissectors/packet-lisp.c
View File

@ -266,7 +266,7 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree, g
tir = proto_tree_add_text(lisp_tree, tvb, 0, 12 + INET_ADDRLEN,
"EID prefix: %s/%d, TTL: %s, %sAuthoritative, %s",
ip_to_str((guint8 *)&prefix_v4), prefix_mask,
(ttl == 0xFFFFFFFF) ? "Unlimited" : g_strdup_printf("%d", ttl),
(ttl == 0xFFFFFFFF) ? "Unlimited" : ep_strdup_printf("%d", ttl),
(flags&LISP_MAP_AUTH) ? "" : "Not ", lisp_actions[act]);
offset += INET_ADDRLEN;
/* Update the INFO column if there is only one record */
@ -279,7 +279,7 @@ dissect_lisp_mapping(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lisp_tree, g
tir = proto_tree_add_text(lisp_tree, tvb, 0, 12 + INET6_ADDRLEN,
"EID prefix: %s/%d, TTL: %s, %sAuthoritative, %s",
ip6_to_str(&prefix_v6), prefix_mask,
(ttl == 0xFFFFFFFF) ? "Unlimited" : g_strdup_printf("%d", ttl),
(ttl == 0xFFFFFFFF) ? "Unlimited" : ep_strdup_printf("%d", ttl),
(flags&LISP_MAP_AUTH) ? "" : "Not ", lisp_actions[act]);
offset += INET6_ADDRLEN;
/* Update the INFO column if there is only one record */