Differences From Artifact [ed305bf072]:
- File
src/OFLHAArchiveEntry.m
— part of check-in
[d57a56449f]
at
2024-02-24 13:51:46
on branch trunk
— OFLHAArchiveEntry: Parse compression method last
This avoids trying to parse the compression method when the header level
is invalid. (user: js, size: 20272) [annotate] [blame] [check-ins using]
To Artifact [76b8e70f25]:
- File src/OFLHAArchiveEntry.m — part of check-in [4c56240653] at 2024-02-24 15:05:13 on branch trunk — OFLHAArchiveEntry: Add extra sanity checks (user: js, size: 20449) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 |
case 0:
case 1:;
void *pool = objc_autoreleasePoolPush();
uint8_t extendedAreaSize;
uint8_t fileNameLength;
OFString *tmp;
_modificationDate = [parseMSDOSDate(date) retain];
fileNameLength = [stream readInt8];
tmp = [stream readStringWithLength: fileNameLength
encoding: encoding];
tmp = [tmp stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
_fileName = [tmp copy];
_CRC16 = [stream readLittleEndianInt16];
extendedAreaSize =
header[0] - (21 - 2) - 1 - fileNameLength - 2;
if (_headerLevel == 1) {
_operatingSystemIdentifier = [stream readInt8];
/*
* 1 for the operating system identifier, 2
* because we don't want to skip the size of
* the next extended header.
*/
| > > > > > > > | 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 |
case 0:
case 1:;
void *pool = objc_autoreleasePoolPush();
uint8_t extendedAreaSize;
uint8_t fileNameLength;
OFString *tmp;
if (header[0] < (21 - 2) + 1 + 2)
@throw [OFInvalidFormatException exception];
_modificationDate = [parseMSDOSDate(date) retain];
fileNameLength = [stream readInt8];
tmp = [stream readStringWithLength: fileNameLength
encoding: encoding];
tmp = [tmp stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
_fileName = [tmp copy];
_CRC16 = [stream readLittleEndianInt16];
extendedAreaSize =
header[0] - (21 - 2) - 1 - fileNameLength - 2;
if (_headerLevel == 1) {
if (extendedAreaSize < 3)
@throw [OFInvalidFormatException
exception];
_operatingSystemIdentifier = [stream readInt8];
/*
* 1 for the operating system identifier, 2
* because we don't want to skip the size of
* the next extended header.
*/
|
| ︙ | ︙ |