aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dfilter
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-10-27 08:53:44 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2015-10-27 17:22:38 +0000
commitb86e2a360968dc819f5e7cf96b6f470428b31632 (patch)
tree8ad3b6094f7ed1fc5c55ff2051861e911830d57c /epan/dfilter
parent4f22e9937f72a43e53262d0ca3297f686109f4c4 (diff)
Dfilter: Mark an error in %syntax_error
Because of a change in lemon the %parse_failure is not always called. Bug: 11637 Change-Id: Iea218aeee10e20f29461169829a10345bbdac903 Reviewed-on: https://code.wireshark.org/review/11302 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan/dfilter')
-rw-r--r--epan/dfilter/grammar.lemon2
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dfilter/grammar.lemon b/epan/dfilter/grammar.lemon
index d3bab21ed5..0ea861d446 100644
--- a/epan/dfilter/grammar.lemon
+++ b/epan/dfilter/grammar.lemon
@@ -73,6 +73,7 @@ any "error" symbols are shifted, if possible. */
if (!TOKEN) {
dfilter_fail(dfw, "Unexpected end of filter string.");
+ dfw->syntax_error = TRUE;
return;
}
@@ -115,6 +116,7 @@ any "error" symbols are shifted, if possible. */
g_assert_not_reached();
break;
}
+ dfw->syntax_error = TRUE;
}
/* When a parse fails, mark an error. This occurs after