ObjFW  Diff

Differences From Artifact [c9d5ecbee3]:

To Artifact [73678fe27b]:


21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42















43
44
45
46
47
48
49
21
22
23
24
25
26
27















28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49







-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+







#import "OFKernelEventObserver.h"

#import "OFHuffmanTree.h"

#import "OFInvalidFormatException.h"
#import "OFNotOpenException.h"

enum state {
	StateBlockHeader,
	StateCodeLenCodesCount,
	StateCodeLenTree,
	StateCodeLenTreeSingle,
	StateLitLenCodesCount,
	StateLitLenTree,
	StateLitLenTreeSingle,
	StateDistCodesCount,
	StateDistTree,
	StateDistTreeSingle,
	StateBlockLitLen,
	StateBlockDistLength,
	StateBlockDistLengthExtra,
	StateBlockLenDistPair
enum State {
	stateBlockHeader,
	stateCodeLenCodesCount,
	stateCodeLenTree,
	stateCodeLenTreeSingle,
	stateLitLenCodesCount,
	stateLitLenTree,
	stateLitLenTreeSingle,
	stateDistCodesCount,
	stateDistTree,
	stateDistTreeSingle,
	stateBlockLitLen,
	stateBlockDistLength,
	stateBlockDistLengthExtra,
	stateBlockLenDistPair
};

@implementation OFLHADecompressingStream
@synthesize bytesConsumed = _bytesConsumed;

static OF_INLINE bool
tryReadBits(OFLHADecompressingStream *stream, uint16_t *bits, uint8_t count)
144
145
146
147
148
149
150
151

152
153
154
155
156


157
158
159
160
161
162

163
164

165
166
167
168
169
170
171
172

173
174
175
176
177
178
179
180
181

182
183

184
185
186
187
188
189
190
144
145
146
147
148
149
150

151
152
153
154


155
156
157
158
159
160
161

162
163

164
165
166
167
168
169
170
171

172
173
174
175
176
177
178
179
180

181
182

183
184
185
186
187
188
189
190







-
+



-
-
+
+





-
+

-
+







-
+








-
+

-
+







	uint16_t bits = 0, value = 0;
	size_t bytesWritten = 0;

	if (_stream == nil)
		@throw [OFNotOpenException exceptionWithObject: self];

	if (_stream.atEndOfStream && _bufferLength - _bufferIndex == 0 &&
	    _state == StateBlockHeader)
	    _state == stateBlockHeader)
		return 0;

start:
	switch ((enum state)_state) {
	case StateBlockHeader:
	switch ((enum State)_state) {
	case stateBlockHeader:
		if OF_UNLIKELY (!tryReadBits(self, &bits, 16))
			return bytesWritten;

		_symbolsLeft = bits;

		_state = StateCodeLenCodesCount;
		_state = stateCodeLenCodesCount;
		goto start;
	case StateCodeLenCodesCount:
	case stateCodeLenCodesCount:
		if OF_UNLIKELY (!tryReadBits(self, &bits, 5))
			return bytesWritten;

		if OF_UNLIKELY (bits > 20)
			@throw [OFInvalidFormatException exception];

		if OF_UNLIKELY (bits == 0) {
			_state = StateCodeLenTreeSingle;
			_state = stateCodeLenTreeSingle;
			goto start;
		}

		_codesCount = bits;
		_codesReceived = 0;
		_codesLengths = OFAllocZeroedMemory(bits, 1);
		_skip = true;

		_state = StateCodeLenTree;
		_state = stateCodeLenTree;
		goto start;
	case StateCodeLenTree:
	case stateCodeLenTree:
		while (_codesReceived < _codesCount) {
			if OF_UNLIKELY (_currentIsExtendedLength) {
				if OF_UNLIKELY (!tryReadBits(self, &bits, 1))
					return bytesWritten;

				if OF_UNLIKELY (bits == 0) {
					_codesReceived++;
224
225
226
227
228
229
230
231

232
233

234
235
236
237
238
239

240
241

242
243
244
245
246
247
248
249
250
251
252

253
254
255
256
257
258
259
260
261
262

263
264

265
266
267
268
269
270
271
224
225
226
227
228
229
230

231
232

233
234
235
236
237
238

239
240

241
242
243
244
245
246
247
248
249
250
251

252
253
254
255
256
257
258
259
260
261

262
263

264
265
266
267
268
269
270
271







-
+

-
+





-
+

-
+










-
+









-
+

-
+







				_codesReceived++;
		}

		_codeLenTree = OFHuffmanTreeNew(_codesLengths, _codesCount);
		OFFreeMemory(_codesLengths);
		_codesLengths = NULL;

		_state = StateLitLenCodesCount;
		_state = stateLitLenCodesCount;
		goto start;
	case StateCodeLenTreeSingle:
	case stateCodeLenTreeSingle:
		if OF_UNLIKELY (!tryReadBits(self, &bits, 5))
			return bytesWritten;

		_codeLenTree = OFHuffmanTreeNewSingle(bits);

		_state = StateLitLenCodesCount;
		_state = stateLitLenCodesCount;
		goto start;
	case StateLitLenCodesCount:
	case stateLitLenCodesCount:
		if OF_UNLIKELY (!tryReadBits(self, &bits, 9))
			return bytesWritten;

		if OF_UNLIKELY (bits > 510)
			@throw [OFInvalidFormatException exception];

		if OF_UNLIKELY (bits == 0) {
			OFHuffmanTreeFree(_codeLenTree);
			_codeLenTree = NULL;

			_state = StateLitLenTreeSingle;
			_state = stateLitLenTreeSingle;
			goto start;
		}

		_codesCount = bits;
		_codesReceived = 0;
		_codesLengths = OFAllocZeroedMemory(bits, 1);
		_skip = false;

		_treeIter = _codeLenTree;
		_state = StateLitLenTree;
		_state = stateLitLenTree;
		goto start;
	case StateLitLenTree:
	case stateLitLenTree:
		while (_codesReceived < _codesCount) {
			if OF_UNLIKELY (_skip) {
				uint16_t skipCount;

				switch (_codesLengths[_codesReceived]) {
				case 0:
					skipCount = 1;
316
317
318
319
320
321
322
323

324
325

326
327
328
329
330
331

332
333

334
335
336
337
338
339
340
341

342
343
344
345
346
347
348
349
350

351
352

353
354
355
356
357
358
359
316
317
318
319
320
321
322

323
324

325
326
327
328
329
330

331
332

333
334
335
336
337
338
339
340

341
342
343
344
345
346
347
348
349

350
351

352
353
354
355
356
357
358
359







-
+

-
+





-
+

-
+







-
+








-
+

-
+







		_litLenTree = OFHuffmanTreeNew(_codesLengths, _codesCount);
		OFFreeMemory(_codesLengths);
		_codesLengths = NULL;

		OFHuffmanTreeFree(_codeLenTree);
		_codeLenTree = NULL;

		_state = StateDistCodesCount;
		_state = stateDistCodesCount;
		goto start;
	case StateLitLenTreeSingle:
	case stateLitLenTreeSingle:
		if OF_UNLIKELY (!tryReadBits(self, &bits, 9))
			return bytesWritten;

		_litLenTree = OFHuffmanTreeNewSingle(bits);

		_state = StateDistCodesCount;
		_state = stateDistCodesCount;
		goto start;
	case StateDistCodesCount:
	case stateDistCodesCount:
		if OF_UNLIKELY (!tryReadBits(self, &bits, _distanceBits))
			return bytesWritten;

		if OF_UNLIKELY (bits > _dictionaryBits)
			@throw [OFInvalidFormatException exception];

		if OF_UNLIKELY (bits == 0) {
			_state = StateDistTreeSingle;
			_state = stateDistTreeSingle;
			goto start;
		}

		_codesCount = bits;
		_codesReceived = 0;
		_codesLengths = OFAllocZeroedMemory(bits, 1);

		_treeIter = _codeLenTree;
		_state = StateDistTree;
		_state = stateDistTree;
		goto start;
	case StateDistTree:
	case stateDistTree:
		while (_codesReceived < _codesCount) {
			if OF_UNLIKELY (_currentIsExtendedLength) {
				if OF_UNLIKELY (!tryReadBits(self, &bits, 1))
					return bytesWritten;

				if OF_UNLIKELY (bits == 0) {
					_codesReceived++;
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
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







-
+

-
+






-
+

-
+





-
+







		}

		_distTree = OFHuffmanTreeNew(_codesLengths, _codesCount);
		OFFreeMemory(_codesLengths);
		_codesLengths = NULL;

		_treeIter = _litLenTree;
		_state = StateBlockLitLen;
		_state = stateBlockLitLen;
		goto start;
	case StateDistTreeSingle:
	case stateDistTreeSingle:
		if OF_UNLIKELY (!tryReadBits(self, &bits, _distanceBits))
			return bytesWritten;

		_distTree = OFHuffmanTreeNewSingle(bits);

		_treeIter = _litLenTree;
		_state = StateBlockLitLen;
		_state = stateBlockLitLen;
		goto start;
	case StateBlockLitLen:
	case stateBlockLitLen:
		if OF_UNLIKELY (_symbolsLeft == 0) {
			OFHuffmanTreeFree(_litLenTree);
			OFHuffmanTreeFree(_distTree);
			_litLenTree = _distTree = NULL;

			_state = StateBlockHeader;
			_state = stateBlockHeader;

			/*
			 * We must return here, as there is no indication
			 * whether this was the last block. Whoever called this
			 * method needs to check if everything has been read
			 * already and only call read again if that is not the
			 * case.
437
438
439
440
441
442
443
444

445
446
447
448

449
450
451
452
453
454
455
456

457
458

459
460
461
462
463
464

465
466

467
468
469
470
471
472
473
437
438
439
440
441
442
443

444
445
446
447

448
449
450
451
452
453
454
455

456
457

458
459
460
461
462
463

464
465

466
467
468
469
470
471
472
473







-
+



-
+







-
+

-
+





-
+

-
+







			    _slidingWindowMask;

			_symbolsLeft--;
			_treeIter = _litLenTree;
		} else {
			_length = value - 253;
			_treeIter = _distTree;
			_state = StateBlockDistLength;
			_state = stateBlockDistLength;
		}

		goto start;
	case StateBlockDistLength:
	case stateBlockDistLength:
		if OF_UNLIKELY (!OFHuffmanTreeWalk(self, tryReadBits,
		    &_treeIter, &value))
			return bytesWritten;

		_distance = value;

		_state = (value < 2
		    ? StateBlockLenDistPair : StateBlockDistLengthExtra);
		    ? stateBlockLenDistPair : stateBlockDistLengthExtra);
		goto start;
	case StateBlockDistLengthExtra:
	case stateBlockDistLengthExtra:
		if OF_UNLIKELY (!tryReadBits(self, &bits, _distance - 1))
			return bytesWritten;

		_distance = bits + (1u << (_distance - 1));

		_state = StateBlockLenDistPair;
		_state = stateBlockLenDistPair;
		goto start;
	case StateBlockLenDistPair:
	case stateBlockLenDistPair:
		for (uint_fast16_t i = 0; i < _length; i++) {
			uint32_t idx;

			if OF_UNLIKELY (length == 0) {
				_length -= i;
				return bytesWritten;
			}
483
484
485
486
487
488
489
490

491
492
493
494
495
496
497
498
499
500
501
502
503

504
505
506
507
508
509
510
483
484
485
486
487
488
489

490
491
492
493
494
495
496
497
498
499
500
501
502

503
504
505
506
507
508
509
510







-
+












-
+







			_slidingWindowIndex = (_slidingWindowIndex + 1) &
			    _slidingWindowMask;
		}

		_symbolsLeft--;

		_treeIter = _litLenTree;
		_state = StateBlockLitLen;
		_state = stateBlockLitLen;
		goto start;
	}

	OF_UNREACHABLE
}

- (bool)lowlevelIsAtEndOfStream
{
	if (_stream == nil)
		@throw [OFNotOpenException exceptionWithObject: self];

	return (_stream.atEndOfStream &&
	    _bufferLength - _bufferIndex == 0 && _state == StateBlockHeader);
	    _bufferLength - _bufferIndex == 0 && _state == stateBlockHeader);
}

- (int)fileDescriptorForReading
{
	return ((id <OFReadyForReadingObserving>)_stream)
	    .fileDescriptorForReading;
}