lib-storage: Make it easier to debug mail's unclosed istream

diff --git a/src/lib-storage/index/index-mail.c b/src/lib-storage/index/index-mail.c
index dceb2c949bb0dc1995f3fdc9a7c0b761d4f9bc0c..856822e71f3c11dd250d05c58552bd8fe95a11f3 100644 (file)
--- a/src/lib-storage/index/index-mail.c
+++ b/src/lib-storage/index/index-mail.c
@@ -1499,6 +1499,8 @@ static void index_mail_close_streams_full(struct index_mail *mail, bool closing)
        if (data->filter_stream != NULL)
                i_stream_unref(&data->filter_stream);
        if (data->stream != NULL) {
+               struct istream *orig_stream = data->stream;
+
                data->destroying_stream = TRUE;
                if (!closing && data->destroy_callback_set) {
                        /* we're replacing the stream with a new one. it's
@@ -1508,12 +1510,13 @@ static void index_mail_close_streams_full(struct index_mail *mail, bool closing)
                                index_mail_stream_destroy_callback);
                }
                i_stream_unref(&data->stream);
-               if (closing) {
-                       /* there must be no references to the mail when the
-                          mail is being closed. */
-                       i_assert(!mail->data.destroying_stream);
-               } else {
+               /* there must be no references to the mail when the
+                  mail is being closed. */
+               if (!closing)
                        data->destroying_stream = FALSE;
+               else if (mail->data.destroying_stream) {
+                       i_panic("Input stream %s unexpectedly has references",
+                               i_stream_get_name(orig_stream));
                }
 
                data->initialized_wrapper_stream = FALSE;