From e54e6b0219743b45d10b676a1b4df95c8611146b Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 26 Jan 2019 23:47:20 +0200 Subject: Minor fix * imap4d/search.c (parse_search_key): Fix eventual NULL pointer dereference. --- imap4d/search.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/imap4d/search.c b/imap4d/search.c index c0309434a..fdde44ba0 100644 --- a/imap4d/search.c +++ b/imap4d/search.c @@ -545,8 +545,14 @@ parse_search_key (struct parsebuf *pb) if (parse_gettoken (pb, 1) == 0) return NULL; - if ((leftarg = parse_search_key (pb)) == NULL - || (rightarg = parse_search_key (pb)) == NULL) + if ((leftarg = parse_search_key (pb)) == NULL) + return NULL; + if (!pb->token) + { + pb->err_mesg = "Too few args"; + return NULL; + } + if ((rightarg = parse_search_key (pb)) == NULL) return NULL; node = parse_alloc (pb, sizeof *node); -- cgit v1.2.1