From: Timo Sirainen Date: Mon, 15 Feb 2010 04:12:59 +0000 (+0200) Subject: mbox: istream_raw_mbox_get_body_size() no longer crashes if header wasn't read. X-Git-Tag: 2.0.beta3~66 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ccee8446c9d6aef211114fb7483c2e98eb96f06;p=thirdparty%2Fdovecot%2Fcore.git mbox: istream_raw_mbox_get_body_size() no longer crashes if header wasn't read. --HG-- branch : HEAD --- diff --git a/src/lib-storage/index/mbox/istream-raw-mbox.c b/src/lib-storage/index/mbox/istream-raw-mbox.c index c4eb57de15..9fc255edce 100644 --- a/src/lib-storage/index/mbox/istream-raw-mbox.c +++ b/src/lib-storage/index/mbox/istream-raw-mbox.c @@ -569,8 +569,8 @@ uoff_t istream_raw_mbox_get_body_size(struct istream *stream, i_assert(rstream->seeked); i_assert(rstream->hdr_offset != (uoff_t)-1); - i_assert(rstream->body_offset != (uoff_t)-1); + (void)istream_raw_mbox_get_body_offset(stream); body_size = rstream->mail_size == (uoff_t)-1 ? (uoff_t)-1 : rstream->mail_size - (rstream->body_offset - rstream->hdr_offset);