lib: i_stream_read() - Don't create empty snapshots

This allows the read() implementation to read data into the existing
memarea. Otherwise a new memarea might have to be created because the old
one is referenced by the snapshot.

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 4b5e810df03c541ce8cee860e9e79acdee74ba6a..06fd93e8ca28ec4aae44127c2412a5d0d1de83f4 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -266,8 +266,10 @@ ssize_t i_stream_read(struct istream *stream)
        }
 #endif
 
-       _stream->prev_snapshot =
-               _stream->snapshot(_stream, _stream->prev_snapshot);
+       if (_stream->skip != _stream->pos || _stream->prev_snapshot != NULL) {
+               _stream->prev_snapshot =
+                       _stream->snapshot(_stream, _stream->prev_snapshot);
+       }
        ret = i_stream_read_memarea(stream);
        if (ret > 0)
                i_stream_snapshot_free(&_stream->prev_snapshot);