diff options
Diffstat (limited to 'epan/proto.c')
| -rw-r--r-- | epan/proto.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/proto.c b/epan/proto.c index 4c07a5e2c9..d22e41539a 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5636,8 +5636,9 @@ tmp_fld_check_assert(header_field_info *hfinfo) (hfinfo->type == FT_INT56) || (hfinfo->type == FT_INT64) || (hfinfo->type == FT_BOOLEAN) || - (hfinfo->type == FT_PROTOCOL) )) - g_error("Field '%s' (%s) has a 'strings' value but is of type %s" + (hfinfo->type == FT_PROTOCOL) || + (hfinfo->type == FT_FRAMENUM) )) + g_error("Field '%s' (%s) has a 'strings' value but is of type %s" " (which is not allowed to have strings)\n", hfinfo->name, hfinfo->abbrev, ftype_name(hfinfo->type)); @@ -6637,7 +6638,7 @@ fill_label_number(field_info *fi, gchar *label_str, gboolean is_signed) fmtfunc(tmp, value); label_fill(label_str, 0, hfinfo, tmp); } - else if (hfinfo->strings) { + else if (hfinfo->strings && hfinfo->type != FT_FRAMENUM) { /* Add fill_label_framenum? */ const char *val_str = hf_try_val_to_str_const(value, hfinfo, "Unknown"); out = hfinfo_number_vals_format(hfinfo, buf, value); |