From 63a2f941c1ad029061129ba6384d1d2a02382220 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Wed, 1 Apr 2009 16:09:58 -0400 Subject: [PATCH] istream-tee: Added some more asserts. --HG-- branch : HEAD --- src/lib/istream-tee.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/istream-tee.c b/src/lib/istream-tee.c index 1a4090550b..40871cb1e1 100644 --- a/src/lib/istream-tee.c +++ b/src/lib/istream-tee.c @@ -123,9 +123,9 @@ static ssize_t i_stream_tee_read(struct istream_private *stream) the parent stream without having to read more. */ last_high_offset = stream->istream.v_offset + (stream->pos - stream->skip); - i_assert(last_high_offset <= input->v_offset + size); - if (last_high_offset == input->v_offset + size) { + if (stream->pos == size) { /* we've read everything, need to read more */ + i_assert(last_high_offset == input->v_offset + size); tee_streams_skip(tstream->tee); ret = i_stream_read(input); if (ret <= 0) { @@ -143,6 +143,7 @@ static ssize_t i_stream_tee_read(struct istream_private *stream) data = i_stream_get_data(input, &size); } else { /* there's still some data available from parent */ + i_assert(last_high_offset < input->v_offset + size); i_assert(stream->pos < size); stream->buffer = data; } -- 2.47.3