thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Fix successive seeks in BufferedSeekableReadStream.

Browse source 
This fixes the failing test case added in
da8eeb9dbe.

Thanks to wjp for his input on this.
This commit is contained in:
Johannes Schickel 2013-01-28 17:30:57 +01:00
parent d0e9ef7dc1
commit 5bfd2f6756
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/stream.cpp
View file

@ -393,7 +393,14 @@ bool BufferedSeekableReadStream::seek(int32 offset, int whence) {
// just seek normally in the parent stream.
if (whence == SEEK_CUR)
offset -= (_bufSize - _pos);
_pos = _bufSize;
// We invalidate the buffer here. This assures that successive seeks
// do not have the chance to incorrectly think they seeked back into
// the buffer.
// Note: This does not take full advantage of the buffer. But it is
// a simple way to prevent nasty errors. It would be possible to take
// full advantage of the buffer by saving its actual start position.
// This seems not worth the effort for this seemingly uncommon use.
_pos = _bufSize = 0;
_parentStream->seek(offset, whence);
}