Overview
Comment: | OFLHAArchiveEntry: Skip level 2 header padding |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | 1.0 |
Files: | files | file ages | folders |
SHA3-256: |
657514726f3d340a2b56bb519ea68438 |
User & Date: | js on 2024-02-27 19:52:54 |
Other Links: | branch diff | manifest | tags |
Context
2024-02-27
| ||
20:21 | Minor documentation fix check-in: 60e2e56a2d user: js tags: 1.0 | |
19:52 | OFLHAArchiveEntry: Skip level 2 header padding check-in: 657514726f user: js tags: 1.0 | |
19:44 | OFLHAArchiveEntry: Skip level 2/3 header padding check-in: d7e496ba27 user: js tags: trunk | |
00:57 | OFStream: Minor documentation fix check-in: f111a22ede user: js tags: 1.0 | |
Changes
Modified src/OFLHAArchiveEntry.m from [f084e9ff1d] to [3d1d2bc4d6].
︙ | ︙ | |||
239 240 241 242 243 244 245 | if (function == NULL) return false; function(entry, extension, encoding); return true; } | | > > > | > | > | > > > > > | 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 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 | if (function == NULL) return false; function(entry, extension, encoding); return true; } static size_t readExtensions(OFLHAArchiveEntry *entry, OFStream *stream, OFStringEncoding encoding, bool allowFileName) { size_t consumed = 0; for (;;) { uint16_t size; OFData *extension; size = [stream readLittleEndianInt16]; consumed += 2; if (size == 0) break; if (size < 2) @throw [OFInvalidFormatException exception]; extension = [stream readDataWithCount: size - 2]; consumed += extension.count; if (!parseExtension(entry, extension, encoding, allowFileName)) [entry->_extensions addObject: extension]; if (entry->_headerLevel == 1) { if (entry->_compressedSize < size) @throw [OFInvalidFormatException exception]; entry->_compressedSize -= size; } } return consumed; } static void getFileNameAndDirectoryName(OFLHAArchiveEntry *entry, OFStringEncoding encoding, const char **fileName, size_t *fileNameLength, const char **directoryName, size_t *directoryNameLength) { |
︙ | ︙ | |||
386 387 388 389 390 391 392 | * 1 for the operating system identifier, 2 * because we don't want to skip the size of * the next extended header. */ extendedAreaSize -= 1 + 2; } | | | > > > > > > > > | > > > > > > > > > > > > > > > > > > > | 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 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 | * 1 for the operating system identifier, 2 * because we don't want to skip the size of * the next extended header. */ extendedAreaSize -= 1 + 2; } /* Skip extended area */ if ([stream isKindOfClass: [OFSeekableStream class]]) [(OFSeekableStream *)stream seekToOffset: extendedAreaSize whence: OFSeekCurrent]; else { char buffer[256]; while (extendedAreaSize > 0) extendedAreaSize -= [stream readIntoBuffer: buffer length: extendedAreaSize]; } if (_headerLevel == 1) readExtensions(self, stream, encoding, false); objc_autoreleasePoolPop(pool); break; case 2:; uint32_t padding = 0; _modificationDate = [[OFDate alloc] initWithTimeIntervalSince1970: date]; _CRC16 = [stream readLittleEndianInt16]; _operatingSystemIdentifier = [stream readInt8]; /* * 21 for header, 2 for CRC16, 1 for operating system * identifier. */ padding = ((header[1] << 8) | header[0]) - 21 - 2 - 1; padding -= readExtensions(self, stream, encoding, true); /* Skip padding */ if ([stream isKindOfClass: [OFSeekableStream class]]) [(OFSeekableStream *)stream seekToOffset: padding whence: OFSeekCurrent]; else { while (padding > 0) { char buffer[512]; size_t min = padding; if (min > 512) min = 512; padding -= [stream readIntoBuffer: buffer length: min]; } } break; default:; OFString *version = [OFString stringWithFormat: @"%u", _headerLevel]; @throw [OFUnsupportedVersionException |
︙ | ︙ |