Differences From Artifact [c1d8d6e047]:
- File
src/OFInflateStream.m
— part of check-in
[9e9ce6aa1c]
at
2020-09-27 03:08:51
on branch trunk
— Work around bugs in Apple GCC 4.0.1
Still miscompiles things. (user: js, size: 16898) [annotate] [blame] [check-ins using] [more...]
To Artifact [b112db9229]:
- File src/OFInflateStream.m — part of check-in [da1fb6b21c] at 2020-11-05 02:27:35 on branch trunk — Further reduce usage of -[allocMemoryWithSize:] (user: js, size: 16873) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
192 193 194 195 196 197 198 | _bitIndex = 8; #ifdef OF_INFLATE64_STREAM_M _slidingWindowMask = 0xFFFF; #else _slidingWindowMask = 0x7FFF; #endif | < | > > | > > > | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 |
_bitIndex = 8;
#ifdef OF_INFLATE64_STREAM_M
_slidingWindowMask = 0xFFFF;
#else
_slidingWindowMask = 0x7FFF;
#endif
_slidingWindow = of_calloc(_slidingWindowMask + 1, 1);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
if (_stream != nil)
[self close];
free(_slidingWindow);
if (_state == HUFFMAN_TREE) {
free(_context.huffmanTree.lengths);
if (_context.huffmanTree.codeLenTree != NULL)
of_huffman_tree_release(
_context.huffmanTree.codeLenTree);
}
if (_state == HUFFMAN_TREE || _state == HUFFMAN_BLOCK) {
if (_context.huffman.litLenTree != fixedLitLenTree)
of_huffman_tree_release(_context.huffman.litLenTree);
if (_context.huffman.distTree != fixedDistTree)
of_huffman_tree_release(_context.huffman.distTree);
}
|
| ︙ | ︙ | |||
372 373 374 375 376 377 378 | if OF_UNLIKELY (!tryReadBits(self, &bits, 4)) return bytesWritten; CTX.codeLenCodesCount = bits; } if OF_LIKELY (CTX.lengths == NULL) | | < | | | | 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 |
if OF_UNLIKELY (!tryReadBits(self, &bits, 4))
return bytesWritten;
CTX.codeLenCodesCount = bits;
}
if OF_LIKELY (CTX.lengths == NULL)
CTX.lengths = of_calloc(19, 1);
for (uint16_t i = CTX.receivedCount;
i < CTX.codeLenCodesCount + 4; i++) {
if OF_UNLIKELY (!tryReadBits(self, &bits, 3)) {
CTX.receivedCount = i;
return bytesWritten;
}
CTX.lengths[codeLengthsOrder[i]] = bits;
}
CTX.codeLenTree = of_huffman_tree_construct(
CTX.lengths, 19);
CTX.treeIter = CTX.codeLenTree;
free(CTX.lengths);
CTX.lengths = NULL;
CTX.receivedCount = 0;
CTX.value = 0xFF;
}
if OF_LIKELY (CTX.lengths == NULL)
CTX.lengths = of_malloc(
CTX.litLenCodesCount + CTX.distCodesCount + 258, 1);
for (uint16_t i = CTX.receivedCount;
i < CTX.litLenCodesCount + CTX.distCodesCount + 258;) {
uint8_t j, count;
if OF_LIKELY (CTX.value == 0xFF) {
if OF_UNLIKELY (!of_huffman_tree_walk(self,
|
| ︙ | ︙ | |||
480 481 482 483 484 485 486 | CTX.litLenTree = of_huffman_tree_construct(CTX.lengths, CTX.litLenCodesCount + 257); CTX.distTree = of_huffman_tree_construct( CTX.lengths + CTX.litLenCodesCount + 257, CTX.distCodesCount + 1); | | | 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 | CTX.litLenTree = of_huffman_tree_construct(CTX.lengths, CTX.litLenCodesCount + 257); CTX.distTree = of_huffman_tree_construct( CTX.lengths + CTX.litLenCodesCount + 257, CTX.distCodesCount + 1); free(CTX.lengths); /* * litLenTree and distTree are at the same location in * _context.huffman and _context.huffmanTree, thus no need to * set them. */ _state = HUFFMAN_BLOCK; |
| ︙ | ︙ |