diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-05-10 16:04:14 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-05-10 22:49:08 +0000 |
| commit | 1dccd1ee072722fbe6d5e1a9d726a7e87d191f76 (patch) | |
| tree | 4d4059e0eead7303c6d7420a3828332d26bd79fa /ui/cli | |
| parent | 931603c4b84a5e69e94e3bfd3c84332e664062ab (diff) | |
| download | wireshark-1dccd1ee072722fbe6d5e1a9d726a7e87d191f76.tar.gz | |
Have fvalue_to_string_repr always return an (wmem) allocated buffer.
Previous patches converted all fvalue_to_string_repr calls to expect
an allocated buffer (and not a passed in one). Now changing signature
to force an allocated buffer. Added wmem in case that can be taken
advantage of within epan (and since the function signature was changing
anyway).
Change-Id: Ica1ac4a9a182ce0e73303856329e198d9d525b7b
Reviewed-on: https://code.wireshark.org/review/15343
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui/cli')
| -rw-r--r-- | ui/cli/tap-diameter-avp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index bb3602fc6e..02106cd9f4 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -106,11 +106,11 @@ diam_tree_to_csv(proto_node *node, gpointer data) ftype = fvalue_type_ftenum(&fi->value); if (ftype != FT_NONE && ftype != FT_PROTOCOL) { /* convert value to string */ - val_tmp = fvalue_to_string_repr(&fi->value, FTREPR_DISPLAY, hfi->display, NULL); + val_tmp = fvalue_to_string_repr(NULL, &fi->value, FTREPR_DISPLAY, hfi->display); if (val_tmp) { val_str = g_strdup(val_tmp); - g_free(val_tmp); + wmem_free(NULL, val_tmp); } else val_str = g_strdup_printf("unsupported type: %s", ftype_name(ftype)); |