aboutsummaryrefslogtreecommitdiffstats
path: root/sharkd_session.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2018-09-23 22:14:21 +0200
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2018-09-23 20:49:32 +0000
commita76d4da8bf1456156394e5660bf37e5fcd75238c (patch)
tree1413ca17b189d5cf616bb0091a11ea9e2951f5d7 /sharkd_session.c
parent58b24edb191d93c07a693cd37c50fef602b14d9e (diff)
sharkd: Fix check request for empty "" filter
For empty filters dfilter_compile() return success but with NULL dfcode. NULL dfcode cannot be used in dfilter_deprecated_tokens(). Request: {"req":"check","filter":""} was crashing sharkd. Change-Id: Id677fc84251ab27bf691ec8aaee4c5bdf55e4d6c Reviewed-on: https://code.wireshark.org/review/29797 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Diffstat (limited to 'sharkd_session.c')
-rw-r--r--sharkd_session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sharkd_session.c b/sharkd_session.c
index 04948f8f23..8702d75941 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -3335,7 +3335,7 @@ sharkd_session_process_check(char *buf, const jsmntok_t *tokens, int count)
{
const char *s = "ok";
- if (dfilter_deprecated_tokens(dfp))
+ if (dfp && dfilter_deprecated_tokens(dfp))
s = "warn";
printf(",\"filter\":\"%s\"", s);