Fixed and updated zlib #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Integer types in zlib.h were not properly translated into Nim. Most seriously, `Ulong` and `Ulongf` (which are both `unsigned long`) were translated to `int32`, which is wrong on LP64 systems like macOS, iOS and I think 64-bit Linux too. This causes the Nim `ZStream` struct to be much shorter than the real `z_stream` (88 vs 120 bytes), and that causes the size comparison in the inflate/deflateInit functions to fail with Z_VERSION_ERROR, which is actually a good thing because if it kept going it would be smashing memory, since Nim didn't allocate enough space for its struct. I've fixed the types to the best of my knowledge, using the standard C-based types like `cint` and `culong`. The only iffy one is `ZOffT` which has a complicated conditional definition in C -- I think it's supposed to match `off_t`, whose size depends not on the ABI but on whether the filesystem supports 64-bit files... I made it a `clong` since most systems handle 64-bit files nowadays. Fixes nim-lang#23, nim-lang#39, nim-lang#53
The version parameter passed to deflateInitu etc. is supposed to be the compile-time version string (from zlib.h), not the runtime version returned by zlibVersion(). We didn't have a compile-time version constant, so I added one based on the value from the zlib.h header I'm working from, i.e. "1.2.11". Fixes nim-lang#59
Added newer zlib functions: deflateTune, deflatePending, deflatePrime, deflateSetHeader, inflateGetDictionary, inflateCopy, inflateReset2, inflatePrime, inflateMark, inflateGetHeader, zlibCompileFlags. Fixes nim-lang#58
This was referenced Jul 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Three commits addressing these three issues:
ZStreamstruct to be the wrong size, and causing a fatal version-mismatch error. Zlib tests fail: zlib version mismatch! #23, ZlibStreamError due to size mismatch of data types (Linux) #39, fixed: zlib version mismatch! [ZlibStreamError] #53