libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Allow GZipReadStream to work on data in the middle of stream

Browse Source
This commit is contained in:
Le Philousophe 2023-08-15 19:15:54 +02:00 committed by Eugene Sandulenko
parent 191bde03ad
commit be3eb09753
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/compression/zlib.cpp
View File

@ -235,6 +235,7 @@ protected:
ScopedPtr<SeekableReadStream> _wrapped; ScopedPtr<SeekableReadStream> _wrapped;
z_stream _stream; z_stream _stream;
int _zlibErr; int _zlibErr;
uint64 _parentPos;
uint32 _pos; uint32 _pos;
uint32 _origSize; uint32 _origSize;
bool _eos; bool _eos;
@ -244,8 +245,8 @@ public:
GZipReadStream(SeekableReadStream *w, uint32 knownSize = 0) : _wrapped(w), _stream() { GZipReadStream(SeekableReadStream *w, uint32 knownSize = 0) : _wrapped(w), _stream() {
assert(w != nullptr); assert(w != nullptr);
_parentPos = w->pos();
// Verify file header is correct // Verify file header is correct
w->seek(0, SEEK_SET);
uint16 header = w->readUint16BE(); uint16 header = w->readUint16BE();
assert(header == 0x1F8B || assert(header == 0x1F8B ||
((header & 0x0F00) == 0x0800 && header % 31 == 0)); ((header & 0x0F00) == 0x0800 && header % 31 == 0));
@ -259,8 +260,8 @@ public:
// use an otherwise known size if supplied. // use an otherwise known size if supplied.
_origSize = knownSize; _origSize = knownSize;
} }
w->seek(_parentPos, SEEK_SET);
_pos = 0; _pos = 0;
w->seek(0, SEEK_SET);
_eos = false; _eos = false;
// Adding 32 to windowBits indicates to zlib that it is supposed to // Adding 32 to windowBits indicates to zlib that it is supposed to
@ -354,7 +355,7 @@ public:
#endif #endif
_pos = 0; _pos = 0;
_wrapped->seek(0, SEEK_SET); _wrapped->seek(_parentPos, SEEK_SET);
_zlibErr = inflateReset(&_stream); _zlibErr = inflateReset(&_stream);
if (_zlibErr != Z_OK) if (_zlibErr != Z_OK)
return false; // FIXME: STREAM REWRITE return false; // FIXME: STREAM REWRITE