diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-07-02 10:48:58 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-07-02 11:36:11 +0000 |
| commit | 523ce152e82357f67b3cf72b061f92d8dbcc2396 (patch) | |
| tree | 41cca17e06295f313135d4e2f43eb8cc66272c10 | |
| parent | dcd736847408d496d47414458b28e62fecdb6402 (diff) | |
| download | wireshark-523ce152e82357f67b3cf72b061f92d8dbcc2396.tar.gz | |
Do not try to display a value_string for FT_FRAMENUM type
The hfinfo->strings pointer is used to store a ft_framenum_type_t
Bug: 11325
Change-Id: Ia6ee1bdd4f1e6ff93907e6107fcecab56c0320de
Reviewed-on: https://code.wireshark.org/review/9458
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dfilter/semcheck.c | 2 | ||||
| -rw-r--r-- | epan/proto.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c index 9da8e9ba2f..1d86b1b25b 100644 --- a/epan/dfilter/semcheck.c +++ b/epan/dfilter/semcheck.c @@ -222,10 +222,10 @@ mk_fvalue_from_val_string(dfwork_t *dfw, header_field_info *hfinfo, char *s) case FT_OID: case FT_REL_OID: case FT_SYSTEM_ID: + case FT_FRAMENUM: /* hfinfo->strings contains ft_framenum_type_t, not strings */ return NULL; case FT_BOOLEAN: - case FT_FRAMENUM: case FT_UINT8: case FT_UINT16: case FT_UINT24: diff --git a/epan/proto.c b/epan/proto.c index 87be46461d..449e1c5995 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4555,7 +4555,7 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, offset_r += protoo_strlcpy(result+offset_r, tmp, size-offset_r); - } else if (hfinfo->strings) { + } else if (hfinfo->strings && hfinfo->type != FT_FRAMENUM) { number_out = hf_str_val = hf_try_val_to_str(number, hfinfo); if (!number_out) |