lib-mail: Minor code cleanup to message_parser_deinit() calls.

diff --git a/src/lib-mail/istream-attachment-extractor.c b/src/lib-mail/istream-attachment-extractor.c
index fd436fa874cda0ded7f751801d500a7c28e04bd9..bc62146d24f0944d5c3e6e4f4ddfad3fedcea4d5 100644 (file)
--- a/src/lib-mail/istream-attachment-extractor.c
+++ b/src/lib-mail/istream-attachment-extractor.c
@@ -679,11 +679,10 @@ static void i_stream_attachment_extractor_close(struct iostream_private *stream,
        struct attachment_istream *astream =
                (struct attachment_istream *)stream;
        struct message_part *parts;
-       int ret;
 
        if (astream->parser != NULL) {
-               ret = message_parser_deinit(&astream->parser, &parts);
-               i_assert(ret == 0); /* we didn't use preparsed message_parts */
+               if (message_parser_deinit(&astream->parser, &parts) < 0)
+                       i_unreached(); /* we didn't use preparsed message_parts */
        }
        hash_format_deinit_free(&astream->set.hash_format);
        if (astream->pool != NULL)

diff --git a/src/lib-mail/istream-binary-converter.c b/src/lib-mail/istream-binary-converter.c
index ccc2990e2ec9abd10e15a711fc8f2105c05251fc..87f2f419a13f05bb70891ec511c07eb86b94b2ab 100644 (file)
--- a/src/lib-mail/istream-binary-converter.c
+++ b/src/lib-mail/istream-binary-converter.c
@@ -274,8 +274,10 @@ static void i_stream_binary_converter_close(struct iostream_private *stream,
                (struct binary_converter_istream *)stream;
        struct message_part *parts;
 
-       if (bstream->parser != NULL)
-               (void)message_parser_deinit(&bstream->parser, &parts);
+       if (bstream->parser != NULL) {
+               if (message_parser_deinit(&bstream->parser, &parts) < 0)
+                       i_unreached(); /* we didn't use preparsed message_parts */
+       }
        if (bstream->pool != NULL)
                pool_unref(&bstream->pool);
        if (close_parent)