aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dfilter/gencode.c2
-rw-r--r--epan/dfilter/semcheck.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/epan/dfilter/gencode.c b/epan/dfilter/gencode.c
index c5d658f097..9f9dc92bd0 100644
--- a/epan/dfilter/gencode.c
+++ b/epan/dfilter/gencode.c
@@ -497,7 +497,7 @@ dfw_gencode(dfwork_t *dfw)
/* move constants after registers*/
if (dfw->first_constant == -1) {
/* NONE */
- dfw->first_constant = 0;
+ dfw->first_constant = dfw->next_register;
return;
}
diff --git a/epan/dfilter/semcheck.c b/epan/dfilter/semcheck.c
index 3e4fbfe979..681c6d90c7 100644
--- a/epan/dfilter/semcheck.c
+++ b/epan/dfilter/semcheck.c
@@ -1111,9 +1111,10 @@ header_field_info *hfinfo;
if (stnode_type_id(st_arg2) == STTYPE_FIELD) {
hfinfo = (header_field_info*)stnode_data(st_arg2);
- if (hfinfo->type == FT_PROTOCOL)
+ if (hfinfo->type == FT_PROTOCOL) {
dfilter_fail("Protocol (\"%s\") cannot appear on right-hand side of comparison.", hfinfo->abbrev);
THROW(TypeError);
+ }
}
switch (stnode_type_id(st_arg1)) {