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

Have hfinfo_format_text use format_text_wmem. 

Use NULL scope to be safe.

Change-Id: I1967737cf6a1c90cc2e0476d3f2ace63aa0c9153
Reviewed-on: https://code.wireshark.org/review/19857
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-01-29 22:19:57 -05:00
parent ad5cb2eb72
commit 7e7445cc75
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/proto.c
View File

@ -4828,22 +4828,22 @@ proto_tree_set_representation(proto_item *pi, const char *format, va_list ap)
}
}
static const char *
static char *
hfinfo_format_text(const header_field_info *hfinfo, const guchar *string)
{
switch (hfinfo->display) {
case STR_ASCII:
return format_text(string, strlen(string));
return format_text_wmem(NULL, string, strlen(string));
/*
case STR_ASCII_WSP
return format_text_wsp(string, strlen(string));
*/
case STR_UNICODE:
/* XXX, format_unicode_text() */
return string;
return wmem_strdup(NULL, string);
}
return format_text(string, strlen(string));
return format_text_wmem(NULL, string, strlen(string));
}
static int
@ -5311,9 +5311,10 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence,
case FT_UINT_STRING:
case FT_STRINGZPAD:
bytes = (guint8 *)fvalue_get(&finfo->value);
str = hfinfo_format_text(hfinfo, bytes);
offset_r += protoo_strlcpy(result+offset_r,
hfinfo_format_text(hfinfo, bytes),
size-offset_r);
str, size-offset_r);
wmem_free(NULL, str);
break;
case FT_IEEE_11073_SFLOAT:
@ -7683,7 +7684,9 @@ proto_item_fill_label(field_info *fi, gchar *label_str)
case FT_UINT_STRING:
case FT_STRINGZPAD:
bytes = (guint8 *)fvalue_get(&fi->value);
label_fill(label_str, 0, hfinfo, hfinfo_format_text(hfinfo, bytes));
tmp = hfinfo_format_text(hfinfo, bytes);
label_fill(label_str, 0, hfinfo, tmp);
wmem_free(NULL, tmp);
break;
case FT_IEEE_11073_SFLOAT: