aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter/semcheck.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2011-01-22 15:15:51 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2011-01-22 15:15:51 +0000
commit262997e2f41c1c3e2269e2880944861fadaf573d (patch)
treeae43fd522a405f95a2c48aa9138671fadfa84a16 /epan/dfilter/semcheck.c
parent09d5dd80c781963b755f9e2969c7a8daa9e6ecfe (diff)
From Johannes Lange via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5606 :
In semcheck.c the display filter string of an expression is checked against the header_field_info.display value BASE_CUSTOM. But the value of BASE_CUSTOM is applied as bitmask while the actual type is an enum (BASE_CUSTOM = 6). With this BASE_DEC, BASE_DEC_HEX and BASE_HEX_DEC are also matching and are not accepted as filter expression. Actually: BASE_DEC works but not BASE_HEX. And the problem only shows up when trying to match a field in one of these bases against a string (from a value_string). svn path=/trunk/; revision=35621
Diffstat (limited to 'epan/dfilter/semcheck.c')
-rw-r--r--epan/dfilter/semcheck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 0b9fdee1de..369aacf93c 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -230,7 +230,7 @@ mk_fvalue_from_val_string(header_field_info *hfinfo, char *s)
hfinfo->abbrev);
return NULL;
}
- else if (hfinfo->display & BASE_CUSTOM) {
+ else if (hfinfo->display == BASE_CUSTOM) {
/* If a user wants to match against a custom string, we would
* somehow have to have the integer value here to pass it in
* to the custom-display function. But we don't have an