aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2017-05-11 22:29:22 +0200
committerMichael Mann <mmann78@netscape.net>2017-05-12 03:16:21 +0000
commit4e28cf02c5bec2424f150ff9d8e8e9d9bc531854 (patch)
tree2175891b144a9b11dc2518d25ba715efb21b5586 /epan
parent6effc33f56a2e7e03cc7a031f19da7e19e72e165 (diff)
Fix header field info checks for FT_UINT_BYTES.
It should be allowed to have an FT_UINT_BYTES hf entry with BASE_NONE|BASE_ALLOW_ZERO. At the moment, this triggers an assert: Err Field 'Data block' (image-gif.data_block) is an FT_UINT_BYTES but is being displayed as (Bit count: 2048) instead of BASE_NONE For FT_UINT_BYTES entries, we should make the same checks as for FT_BYTES. Don't fall through to the default case. Change-Id: I986a9b779d130919d17595f08b3b63306b3956f2 Reviewed-on: https://code.wireshark.org/review/21606 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r--epan/proto.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c
index eeead6eb1b..00318d6585 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -7239,6 +7239,7 @@ tmp_fld_check_assert(header_field_info *hfinfo)
}
break;
case FT_BYTES:
+ case FT_UINT_BYTES:
/* Require bytes to have a "display type" that could
* add a character between displayed bytes.
*/