lib-storage: Log and hide invalid entries in subscriptions file.

diff --git a/src/lib-storage/list/subscription-file.c b/src/lib-storage/list/subscription-file.c
index 0feceeddffe26195d8f5a814d188736d4e31304c..fcb0040b207b7b8e1340f1976024b3a649cd328e 100644 (file)
--- a/src/lib-storage/list/subscription-file.c
+++ b/src/lib-storage/list/subscription-file.c
@@ -239,7 +239,15 @@ const char *subsfile_list_next(struct subsfile_list_context *ctx)
         for (i = 0;; i++) {
                 line = next_line(ctx->list, ctx->path, ctx->input, &ctx->failed,
                                 i < SUBSCRIPTION_FILE_ESTALE_RETRY_COUNT);
-                if (ctx->input->stream_errno != ESTALE ||
+               if (line != NULL &&
+                   !mailbox_list_is_valid_pattern(ctx->list, line)) {
+                       /* we'll only get into trouble if we show this */
+                       i_warning("Subscriptions file %s: "
+                                 "Ignoring invalid entry: %s",
+                                 ctx->path, line);
+                       continue;
+               }
+               if (ctx->input->stream_errno != ESTALE ||
                     i == SUBSCRIPTION_FILE_ESTALE_RETRY_COUNT)
                         break;