ERF: fix crash when displaying erf.ip_proto field
authorPascal Quantin <pascal.quantin@gmail.com>
Sat, 2 Apr 2016 11:56:43 +0000 (13:56 +0200)
committerPascal Quantin <pascal.quantin@gmail.com>
Sat, 2 Apr 2016 12:00:18 +0000 (12:00 +0000)
Change-Id: Ib1d0c3d44d404dba2edca0d330693cde55beff25
Reviewed-on: https://code.wireshark.org/review/14781
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
epan/dissectors/packet-erf.c

index 1b31d5cb90992938b6b181d93b729bafa0e2397e..5a8e56bd2678e2cc3aea85c7f4ba4c490e9eff9f 100644 (file)
@@ -678,7 +678,7 @@ static const erf_meta_hf_template_t erf_meta_tags[] = {
   { ERF_META_TAG_dest_fc_id,        { "Destination FCID address",           "dest_fc_id",        FT_BYTES,         SEP_DOT,           NULL, 0x0, NULL, HFILL } },
   { ERF_META_TAG_src_port,          { "Source Port",                        "src_port",          FT_UINT32,        BASE_DEC,          NULL, 0x0, NULL, HFILL } },
   { ERF_META_TAG_dest_port,         { "Destination Port",                   "dest_port",         FT_UINT32,        BASE_DEC,          NULL, 0x0, NULL, HFILL } },
-  { ERF_META_TAG_ip_proto,          { "IP Protocol",                        "ip_proto",          FT_UINT32,        BASE_DEC,          &ipproto_val_ext, 0x0, NULL, HFILL } },
+  { ERF_META_TAG_ip_proto,          { "IP Protocol",                        "ip_proto",          FT_UINT32,        BASE_DEC|BASE_EXT_STRING, &ipproto_val_ext, 0x0, NULL, HFILL } },
   { ERF_META_TAG_flow_hash,         { "Flow Hash",                          "flow_hash",         FT_UINT32,        BASE_DEC,          NULL, 0x0, NULL, HFILL } },
   { ERF_META_TAG_filter_match,      { "Filter Match",                       "filter_match",      FT_STRING,        BASE_NONE,         NULL, 0x0, NULL, HFILL } },
   { ERF_META_TAG_filter_match_name, { "Filter Match Name",                  "filter_match_name", FT_STRING,        BASE_NONE,         NULL, 0x0, NULL, HFILL } },