aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2023-03-05 00:05:26 -0800
committerGuy Harris <gharris@sonic.net>2023-03-05 00:05:26 -0800
commit3854770f15f20a218270feb332fe45fd404746b3 (patch)
treefbf9f2846badc4ca73fe7f7e33d74d7389b31167
parent736ed83000aee7005d857de3fd5fc175c6c0e373 (diff)
sharkd: don't report an error if there is no error.
If dfilter_compile() succeeds, but the filter contains deprecated tokens, don't report an error from dfilter_compile() as a warning, as there *is* no error from dfilter_compile(). Instead, report "Filter contains deprecated tokens". (Feel free to improve the error text.) Fixes the crash, at least, in #18886.
-rw-r--r--sharkd_session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sharkd_session.c b/sharkd_session.c
index 3fe071de43..d63a1f2ec1 100644
--- a/sharkd_session.c
+++ b/sharkd_session.c
@@ -4092,7 +4092,7 @@ sharkd_session_process_check(char *buf, const jsmntok_t *tokens, int count)
if (dfilter_compile(tok_filter, &dfp, &df_err))
{
if (dfp && dfilter_deprecated_tokens(dfp))
- sharkd_json_warning(rpcid, df_err->msg);
+ sharkd_json_warning(rpcid, "Filter contains deprecated tokens");
else
sharkd_json_simple_ok(rpcid);