diff options
| author | Michael Mann <mmann78@netscape.net> | 2012-08-14 16:29:38 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2012-08-14 16:29:38 +0000 |
| commit | 41082851795afd9709b77d2d07a76a6d03c1833f (patch) | |
| tree | 6dfbdebba8267cf7dfa6730f9965357c2211db56 /epan | |
| parent | c7a6af44bbb1ebbabcd0919926e95f212c417372 (diff) | |
fix subtle g_strdup_printf() memory leaks with ephemeral memory
svn path=/trunk/; revision=44491
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ajp13.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-fclctl.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-lisp.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index f83589147d..a0bf505155 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -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 ) { diff --git a/epan/dissectors/packet-fclctl.c b/epan/dissectors/packet-fclctl.c index f52c4a5252..d60fbcb04f 100644 --- a/epan/dissectors/packet-fclctl.c +++ b/epan/dissectors/packet-fclctl.c @@ -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")); } diff --git a/epan/dissectors/packet-lisp.c b/epan/dissectors/packet-lisp.c index c9ba624a5b..3a747f70e5 100644 --- a/epan/dissectors/packet-lisp.c +++ b/epan/dissectors/packet-lisp.c @@ -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 */ |