Differences From Artifact [cd213df087]:
- File
src/OFInflateStream.m
— part of check-in
[44413ada84]
at
2018-06-03 20:11:18
on branch trunk
— Work around GCC being extremely buggy
This includes GCC thinking uint16_t and uint_fast16_t have a different
signedness and pointers to subclasses of OFStream and pointers to
OFStream being incompatible pointer types. (user: js, size: 16493) [annotate] [blame] [check-ins using]
To Artifact [2f25e4e657]:
- File src/OFInflateStream.m — part of check-in [aacb5897a0] at 2018-06-03 23:31:17 on branch trunk — Add -[OFObject allocZeroedMemoryWithSize:(count:)] (user: js, size: 16394) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
190 191 192 193 194 195 196 | _bitIndex = 8; #ifdef INFLATE64 _slidingWindowMask = 0xFFFF; #else _slidingWindowMask = 0x7FFF; #endif | | < < | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 |
_bitIndex = 8;
#ifdef INFLATE64
_slidingWindowMask = 0xFFFF;
#else
_slidingWindowMask = 0x7FFF;
#endif
_slidingWindow = [self allocZeroedMemoryWithSize:
_slidingWindowMask + 1];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ | |||
370 371 372 373 374 375 376 |
if OF_LIKELY (CTX.codeLenCodesCount == 0xFF) {
if OF_UNLIKELY (!tryReadBits(self, &bits, 4))
return bytesWritten;
CTX.codeLenCodesCount = bits;
}
| | | | < | 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 |
if OF_LIKELY (CTX.codeLenCodesCount == 0xFF) {
if OF_UNLIKELY (!tryReadBits(self, &bits, 4))
return bytesWritten;
CTX.codeLenCodesCount = bits;
}
if OF_LIKELY (CTX.lengths == NULL)
CTX.lengths = [self
allocZeroedMemoryWithSize: 19];
for (uint16_t i = CTX.receivedCount;
i < CTX.codeLenCodesCount + 4; i++) {
if OF_UNLIKELY (!tryReadBits(self, &bits, 3)) {
CTX.receivedCount = i;
return bytesWritten;
}
|
| ︙ | ︙ |