From a76d4da8bf1456156394e5660bf37e5fcd75238c Mon Sep 17 00:00:00 2001 From: Jakub Zawadzki Date: Sun, 23 Sep 2018 22:14:21 +0200 Subject: 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 Tested-by: Petri Dish Buildbot Reviewed-by: Jakub Zawadzki --- sharkd_session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3