Mercurial > dovecot > core-2.2
changeset 22309:aaa7b43d1c24
imap: Add more error checking to NOTIFY parameter parsing
This should make it clearer to realize when invalid syntax is being used
rather than just ignoring the problem.
author | Timo Sirainen <timo.sirainen@dovecot.fi> |
---|---|
date | Fri, 30 Jun 2017 17:51:34 +0300 |
parents | 7302145e3f53 |
children | a28f5bfb15fc |
files | src/imap/cmd-notify.c |
diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/cmd-notify.c Fri Jun 30 17:33:15 2017 +0300 +++ b/src/imap/cmd-notify.c Fri Jun 30 17:51:34 2017 +0300 @@ -41,6 +41,8 @@ cmd_notify_parse_fetch(struct imap_notify_context *ctx, const struct imap_arg *list) { + if (list->type == IMAP_ARG_EOL) + return -1; /* at least one attribute must be set */ return imap_fetch_att_list_parse(ctx->client, ctx->pool, list, &ctx->fetch_ctx, &ctx->error); } @@ -59,11 +61,17 @@ strcasecmp(str, "NONE") == 0) { /* no events for selected mailbox. this is also the default when NOTIFY command doesn't specify it explicitly */ + if (events[1].type != IMAP_ARG_EOL) + return -1; /* no extra parameters */ return 0; } if (!imap_arg_get_list(events, &list)) return -1; + if (events[1].type != IMAP_ARG_EOL) + return -1; /* no extra parameters */ + if (list->type == IMAP_ARG_EOL) + return -1; /* at least one event */ for (; list->type != IMAP_ARG_EOL; list++) { if (cmd_notify_parse_event(list, &event) < 0) @@ -322,6 +330,15 @@ if (event_group->type == IMAP_ARG_EOL) return -1; mailboxes = event_group++; + /* check that the mailboxes parameter is valid */ + if (IMAP_ARG_IS_ASTRING(mailboxes)) + ; + else if (!imap_arg_get_list(mailboxes, &list)) + return -1; + else if (list->type == IMAP_ARG_EOL) { + /* should have at least one mailbox */ + return -1; + } } else { mailboxes = NULL; }