Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
lib: istream - Fix calling i_stream_nonseekable_try_seek() without in…
…termittent reads.

Calling i_stream_nonseekable_try_seek() sets stream->high_pos when seeking back
within buffer. Once i_stream_read_memarea() is called, the pos is set to
high_pos and the high pos is cleared. However, when no read is performed in the
mean time, another call to i_stream_nonseekable_try_seek() would overwrite the
high_pos value with pos, causing the true value to get lost, leading to all
kinds of issues. This is fixed by checking whether high_pos is already set and
not touching it when it is (first value is the only valid one).

One issue this caused is that the mbox storage would no longer work with
compression, triggering `unexpected EOF' errors.
  • Loading branch information
stephanbosch authored and sirainen committed Oct 13, 2019
1 parent 2461c22 commit 9fd62ff
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lib/istream.c
Expand Up @@ -1065,7 +1065,8 @@ bool i_stream_nonseekable_try_seek(struct istream_private *stream,
/* seeking backwards within what's already cached */
stream->skip = v_offset - start_offset;
stream->istream.v_offset = v_offset;
stream->high_pos = stream->pos;
if (stream->high_pos == 0)
stream->high_pos = stream->pos;
stream->pos = stream->skip;
} else {
/* read forward */
Expand Down

0 comments on commit 9fd62ff

Please sign in to comment.