Differences From Artifact [170a00bdd8]:
- File
src/OFLHAArchiveEntry.m
— part of check-in
[9b1de0cac0]
at
2024-02-24 13:52:01
on branch 1.0
— OFLHAArchiveEntry: Parse compression method last
This avoids trying to parse the compression method when the header level
is invalid. (user: js, size: 19974) [annotate] [blame] [check-ins using] [more...]
To Artifact [0138d44106]:
- File src/OFLHAArchiveEntry.m — part of check-in [581e18268c] at 2024-02-24 15:05:37 on branch 1.0 — OFLHAArchiveEntry: Add extra sanity checks (user: js, size: 20151) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 |
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.
*/
| > > > > > > > | 354 355 356 357 358 359 360 361 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 |
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.
*/
|
| ︙ | ︙ |