diff options
| author | Johannes Schickel | 2013-01-26 07:48:23 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 07:48:23 -0800 |
| commit | e0c5a78a2662fbc739e5ee68f6d37bbb00bfe9a9 (patch) | |
| tree | b558ee150e3af5d061379fd1b941c91dfd41f8ef | |
| parent | 69424b71bd027e4eb29ecadaca5271c5d677cac3 (diff) | |
| parent | 36bfaa6a308654862c5d233fe4e86d9f8c4c02bd (diff) | |
| download | scummvm-rg350-e0c5a78a2662fbc739e5ee68f6d37bbb00bfe9a9.tar.gz scummvm-rg350-e0c5a78a2662fbc739e5ee68f6d37bbb00bfe9a9.tar.bz2 scummvm-rg350-e0c5a78a2662fbc739e5ee68f6d37bbb00bfe9a9.zip | |
Merge pull request #303 from lordhoto/wrap-compressed
Return NULL in wrapCompressedReadStream for compressed streams when ZLIB is disabled.
| -rw-r--r-- | common/zlib.cpp | 10 | ||||
| -rw-r--r-- | common/zlib.h | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/common/zlib.cpp b/common/zlib.cpp index fc8f351054..62904cb150 100644 --- a/common/zlib.cpp +++ b/common/zlib.cpp @@ -392,17 +392,21 @@ public: #endif // USE_ZLIB SeekableReadStream *wrapCompressedReadStream(SeekableReadStream *toBeWrapped, uint32 knownSize) { -#if defined(USE_ZLIB) if (toBeWrapped) { uint16 header = toBeWrapped->readUint16BE(); bool isCompressed = (header == 0x1F8B || ((header & 0x0F00) == 0x0800 && header % 31 == 0)); toBeWrapped->seek(-2, SEEK_CUR); - if (isCompressed) + if (isCompressed) { +#if defined(USE_ZLIB) return new GZipReadStream(toBeWrapped, knownSize); - } +#else + delete toBeWrapped; + return NULL; #endif + } + } return toBeWrapped; } diff --git a/common/zlib.h b/common/zlib.h index 6a840f5fdc..2772ffba06 100644 --- a/common/zlib.h +++ b/common/zlib.h @@ -103,7 +103,9 @@ bool inflateZlibInstallShield(byte *dst, uint dstLen, const byte *src, uint srcL * provides transparent on-the-fly decompression. Assumes the data it * retrieves from the wrapped stream to be either uncompressed or in gzip * format. In the former case, the original stream is returned unmodified - * (and in particular, not wrapped). + * (and in particular, not wrapped). In the latter case the stream is + * returned wrapped, unless there is no ZLIB support, then NULL is returned + * and the old stream is destroyed. * * Certain GZip-formats don't supply an easily readable length, if you * still need the length carried along with the stream, and you know |