| OLD | NEW |
|---|
| (Empty) |
| 1 /* 7zIn.c -- 7z Input functions | |
| 2 2008-12-31 : Igor Pavlov : Public domain */ | |
| 3 | |
| 4 #include "../../7zCrc.h" | |
| 5 #include "../../CpuArch.h" | |
| 6 | |
| 7 #include "7zDecode.h" | |
| 8 #include "7zIn.h" | |
| 9 | |
| 10 #define RINOM(x) { if ((x) == 0) return SZ_ERROR_MEM; } | |
| 11 | |
| 12 #define NUM_FOLDER_CODERS_MAX 32 | |
| 13 #define NUM_CODER_STREAMS_MAX 32 | |
| 14 | |
| 15 void SzArEx_Init(CSzArEx *p) | |
| 16 { | |
| 17 SzAr_Init(&p->db); | |
| 18 p->FolderStartPackStreamIndex = 0; | |
| 19 p->PackStreamStartPositions = 0; | |
| 20 p->FolderStartFileIndex = 0; | |
| 21 p->FileIndexToFolderIndexMap = 0; | |
| 22 } | |
| 23 | |
| 24 void SzArEx_Free(CSzArEx *p, ISzAlloc *alloc) | |
| 25 { | |
| 26 IAlloc_Free(alloc, p->FolderStartPackStreamIndex); | |
| 27 IAlloc_Free(alloc, p->PackStreamStartPositions); | |
| 28 IAlloc_Free(alloc, p->FolderStartFileIndex); | |
| 29 IAlloc_Free(alloc, p->FileIndexToFolderIndexMap); | |
| 30 SzAr_Free(&p->db, alloc); | |
| 31 SzArEx_Init(p); | |
| 32 } | |
| 33 | |
| 34 /* | |
| 35 UInt64 GetFolderPackStreamSize(int folderIndex, int streamIndex) const | |
| 36 { | |
| 37 return PackSizes[FolderStartPackStreamIndex[folderIndex] + streamIndex]; | |
| 38 } | |
| 39 | |
| 40 UInt64 GetFilePackSize(int fileIndex) const | |
| 41 { | |
| 42 int folderIndex = FileIndexToFolderIndexMap[fileIndex]; | |
| 43 if (folderIndex >= 0) | |
| 44 { | |
| 45 const CSzFolder &folderInfo = Folders[folderIndex]; | |
| 46 if (FolderStartFileIndex[folderIndex] == fileIndex) | |
| 47 return GetFolderFullPackSize(folderIndex); | |
| 48 } | |
| 49 return 0; | |
| 50 } | |
| 51 */ | |
| 52 | |
| 53 #define MY_ALLOC(T, p, size, alloc) { if ((size) == 0) p = 0; else \ | |
| 54 if ((p = (T *)IAlloc_Alloc(alloc, (size) * sizeof(T))) == 0) return SZ_ERROR_M
EM; } | |
| 55 | |
| 56 static SRes SzArEx_Fill(CSzArEx *p, ISzAlloc *alloc) | |
| 57 { | |
| 58 UInt32 startPos = 0; | |
| 59 UInt64 startPosSize = 0; | |
| 60 UInt32 i; | |
| 61 UInt32 folderIndex = 0; | |
| 62 UInt32 indexInFolder = 0; | |
| 63 MY_ALLOC(UInt32, p->FolderStartPackStreamIndex, p->db.NumFolders, alloc); | |
| 64 for (i = 0; i < p->db.NumFolders; i++) | |
| 65 { | |
| 66 p->FolderStartPackStreamIndex[i] = startPos; | |
| 67 startPos += p->db.Folders[i].NumPackStreams; | |
| 68 } | |
| 69 | |
| 70 MY_ALLOC(UInt64, p->PackStreamStartPositions, p->db.NumPackStreams, alloc); | |
| 71 | |
| 72 for (i = 0; i < p->db.NumPackStreams; i++) | |
| 73 { | |
| 74 p->PackStreamStartPositions[i] = startPosSize; | |
| 75 startPosSize += p->db.PackSizes[i]; | |
| 76 } | |
| 77 | |
| 78 MY_ALLOC(UInt32, p->FolderStartFileIndex, p->db.NumFolders, alloc); | |
| 79 MY_ALLOC(UInt32, p->FileIndexToFolderIndexMap, p->db.NumFiles, alloc); | |
| 80 | |
| 81 for (i = 0; i < p->db.NumFiles; i++) | |
| 82 { | |
| 83 CSzFileItem *file = p->db.Files + i; | |
| 84 int emptyStream = !file->HasStream; | |
| 85 if (emptyStream && indexInFolder == 0) | |
| 86 { | |
| 87 p->FileIndexToFolderIndexMap[i] = (UInt32)-1; | |
| 88 continue; | |
| 89 } | |
| 90 if (indexInFolder == 0) | |
| 91 { | |
| 92 /* | |
| 93 v3.13 incorrectly worked with empty folders | |
| 94 v4.07: Loop for skipping empty folders | |
| 95 */ | |
| 96 for (;;) | |
| 97 { | |
| 98 if (folderIndex >= p->db.NumFolders) | |
| 99 return SZ_ERROR_ARCHIVE; | |
| 100 p->FolderStartFileIndex[folderIndex] = i; | |
| 101 if (p->db.Folders[folderIndex].NumUnpackStreams != 0) | |
| 102 break; | |
| 103 folderIndex++; | |
| 104 } | |
| 105 } | |
| 106 p->FileIndexToFolderIndexMap[i] = folderIndex; | |
| 107 if (emptyStream) | |
| 108 continue; | |
| 109 indexInFolder++; | |
| 110 if (indexInFolder >= p->db.Folders[folderIndex].NumUnpackStreams) | |
| 111 { | |
| 112 folderIndex++; | |
| 113 indexInFolder = 0; | |
| 114 } | |
| 115 } | |
| 116 return SZ_OK; | |
| 117 } | |
| 118 | |
| 119 | |
| 120 UInt64 SzArEx_GetFolderStreamPos(const CSzArEx *p, UInt32 folderIndex, UInt32 in
dexInFolder) | |
| 121 { | |
| 122 return p->dataPos + | |
| 123 p->PackStreamStartPositions[p->FolderStartPackStreamIndex[folderIndex] + ind
exInFolder]; | |
| 124 } | |
| 125 | |
| 126 int SzArEx_GetFolderFullPackSize(const CSzArEx *p, UInt32 folderIndex, UInt64 *r
esSize) | |
| 127 { | |
| 128 UInt32 packStreamIndex = p->FolderStartPackStreamIndex[folderIndex]; | |
| 129 CSzFolder *folder = p->db.Folders + folderIndex; | |
| 130 UInt64 size = 0; | |
| 131 UInt32 i; | |
| 132 for (i = 0; i < folder->NumPackStreams; i++) | |
| 133 { | |
| 134 UInt64 t = size + p->db.PackSizes[packStreamIndex + i]; | |
| 135 if (t < size) /* check it */ | |
| 136 return SZ_ERROR_FAIL; | |
| 137 size = t; | |
| 138 } | |
| 139 *resSize = size; | |
| 140 return SZ_OK; | |
| 141 } | |
| 142 | |
| 143 | |
| 144 /* | |
| 145 SRes SzReadTime(const CObjectVector<CBuf> &dataVector, | |
| 146 CObjectVector<CSzFileItem> &files, UInt64 type) | |
| 147 { | |
| 148 CBoolVector boolVector; | |
| 149 RINOK(ReadBoolVector2(files.Size(), boolVector)) | |
| 150 | |
| 151 CStreamSwitch streamSwitch; | |
| 152 RINOK(streamSwitch.Set(this, &dataVector)); | |
| 153 | |
| 154 for (int i = 0; i < files.Size(); i++) | |
| 155 { | |
| 156 CSzFileItem &file = files[i]; | |
| 157 CArchiveFileTime fileTime; | |
| 158 bool defined = boolVector[i]; | |
| 159 if (defined) | |
| 160 { | |
| 161 UInt32 low, high; | |
| 162 RINOK(SzReadUInt32(low)); | |
| 163 RINOK(SzReadUInt32(high)); | |
| 164 fileTime.dwLowDateTime = low; | |
| 165 fileTime.dwHighDateTime = high; | |
| 166 } | |
| 167 switch(type) | |
| 168 { | |
| 169 case k7zIdCTime: file.IsCTimeDefined = defined; if (defined) file.CTime =
fileTime; break; | |
| 170 case k7zIdATime: file.IsATimeDefined = defined; if (defined) file.ATime =
fileTime; break; | |
| 171 case k7zIdMTime: file.IsMTimeDefined = defined; if (defined) file.MTime =
fileTime; break; | |
| 172 } | |
| 173 } | |
| 174 return SZ_OK; | |
| 175 } | |
| 176 */ | |
| 177 | |
| 178 static int TestSignatureCandidate(Byte *testBytes) | |
| 179 { | |
| 180 size_t i; | |
| 181 for (i = 0; i < k7zSignatureSize; i++) | |
| 182 if (testBytes[i] != k7zSignature[i]) | |
| 183 return 0; | |
| 184 return 1; | |
| 185 } | |
| 186 | |
| 187 typedef struct _CSzState | |
| 188 { | |
| 189 Byte *Data; | |
| 190 size_t Size; | |
| 191 }CSzData; | |
| 192 | |
| 193 static SRes SzReadByte(CSzData *sd, Byte *b) | |
| 194 { | |
| 195 if (sd->Size == 0) | |
| 196 return SZ_ERROR_ARCHIVE; | |
| 197 sd->Size--; | |
| 198 *b = *sd->Data++; | |
| 199 return SZ_OK; | |
| 200 } | |
| 201 | |
| 202 static SRes SzReadBytes(CSzData *sd, Byte *data, size_t size) | |
| 203 { | |
| 204 size_t i; | |
| 205 for (i = 0; i < size; i++) | |
| 206 { | |
| 207 RINOK(SzReadByte(sd, data + i)); | |
| 208 } | |
| 209 return SZ_OK; | |
| 210 } | |
| 211 | |
| 212 static SRes SzReadUInt32(CSzData *sd, UInt32 *value) | |
| 213 { | |
| 214 int i; | |
| 215 *value = 0; | |
| 216 for (i = 0; i < 4; i++) | |
| 217 { | |
| 218 Byte b; | |
| 219 RINOK(SzReadByte(sd, &b)); | |
| 220 *value |= ((UInt32)(b) << (8 * i)); | |
| 221 } | |
| 222 return SZ_OK; | |
| 223 } | |
| 224 | |
| 225 static SRes SzReadNumber(CSzData *sd, UInt64 *value) | |
| 226 { | |
| 227 Byte firstByte; | |
| 228 Byte mask = 0x80; | |
| 229 int i; | |
| 230 RINOK(SzReadByte(sd, &firstByte)); | |
| 231 *value = 0; | |
| 232 for (i = 0; i < 8; i++) | |
| 233 { | |
| 234 Byte b; | |
| 235 if ((firstByte & mask) == 0) | |
| 236 { | |
| 237 UInt64 highPart = firstByte & (mask - 1); | |
| 238 *value += (highPart << (8 * i)); | |
| 239 return SZ_OK; | |
| 240 } | |
| 241 RINOK(SzReadByte(sd, &b)); | |
| 242 *value |= ((UInt64)b << (8 * i)); | |
| 243 mask >>= 1; | |
| 244 } | |
| 245 return SZ_OK; | |
| 246 } | |
| 247 | |
| 248 static SRes SzReadNumber32(CSzData *sd, UInt32 *value) | |
| 249 { | |
| 250 UInt64 value64; | |
| 251 RINOK(SzReadNumber(sd, &value64)); | |
| 252 if (value64 >= 0x80000000) | |
| 253 return SZ_ERROR_UNSUPPORTED; | |
| 254 if (value64 >= ((UInt64)(1) << ((sizeof(size_t) - 1) * 8 + 2))) | |
| 255 return SZ_ERROR_UNSUPPORTED; | |
| 256 *value = (UInt32)value64; | |
| 257 return SZ_OK; | |
| 258 } | |
| 259 | |
| 260 static SRes SzReadID(CSzData *sd, UInt64 *value) | |
| 261 { | |
| 262 return SzReadNumber(sd, value); | |
| 263 } | |
| 264 | |
| 265 static SRes SzSkeepDataSize(CSzData *sd, UInt64 size) | |
| 266 { | |
| 267 if (size > sd->Size) | |
| 268 return SZ_ERROR_ARCHIVE; | |
| 269 sd->Size -= (size_t)size; | |
| 270 sd->Data += (size_t)size; | |
| 271 return SZ_OK; | |
| 272 } | |
| 273 | |
| 274 static SRes SzSkeepData(CSzData *sd) | |
| 275 { | |
| 276 UInt64 size; | |
| 277 RINOK(SzReadNumber(sd, &size)); | |
| 278 return SzSkeepDataSize(sd, size); | |
| 279 } | |
| 280 | |
| 281 static SRes SzReadArchiveProperties(CSzData *sd) | |
| 282 { | |
| 283 for (;;) | |
| 284 { | |
| 285 UInt64 type; | |
| 286 RINOK(SzReadID(sd, &type)); | |
| 287 if (type == k7zIdEnd) | |
| 288 break; | |
| 289 SzSkeepData(sd); | |
| 290 } | |
| 291 return SZ_OK; | |
| 292 } | |
| 293 | |
| 294 static SRes SzWaitAttribute(CSzData *sd, UInt64 attribute) | |
| 295 { | |
| 296 for (;;) | |
| 297 { | |
| 298 UInt64 type; | |
| 299 RINOK(SzReadID(sd, &type)); | |
| 300 if (type == attribute) | |
| 301 return SZ_OK; | |
| 302 if (type == k7zIdEnd) | |
| 303 return SZ_ERROR_ARCHIVE; | |
| 304 RINOK(SzSkeepData(sd)); | |
| 305 } | |
| 306 } | |
| 307 | |
| 308 static SRes SzReadBoolVector(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *a
lloc) | |
| 309 { | |
| 310 Byte b = 0; | |
| 311 Byte mask = 0; | |
| 312 size_t i; | |
| 313 MY_ALLOC(Byte, *v, numItems, alloc); | |
| 314 for (i = 0; i < numItems; i++) | |
| 315 { | |
| 316 if (mask == 0) | |
| 317 { | |
| 318 RINOK(SzReadByte(sd, &b)); | |
| 319 mask = 0x80; | |
| 320 } | |
| 321 (*v)[i] = (Byte)(((b & mask) != 0) ? 1 : 0); | |
| 322 mask >>= 1; | |
| 323 } | |
| 324 return SZ_OK; | |
| 325 } | |
| 326 | |
| 327 static SRes SzReadBoolVector2(CSzData *sd, size_t numItems, Byte **v, ISzAlloc *
alloc) | |
| 328 { | |
| 329 Byte allAreDefined; | |
| 330 size_t i; | |
| 331 RINOK(SzReadByte(sd, &allAreDefined)); | |
| 332 if (allAreDefined == 0) | |
| 333 return SzReadBoolVector(sd, numItems, v, alloc); | |
| 334 MY_ALLOC(Byte, *v, numItems, alloc); | |
| 335 for (i = 0; i < numItems; i++) | |
| 336 (*v)[i] = 1; | |
| 337 return SZ_OK; | |
| 338 } | |
| 339 | |
| 340 static SRes SzReadHashDigests( | |
| 341 CSzData *sd, | |
| 342 size_t numItems, | |
| 343 Byte **digestsDefined, | |
| 344 UInt32 **digests, | |
| 345 ISzAlloc *alloc) | |
| 346 { | |
| 347 size_t i; | |
| 348 RINOK(SzReadBoolVector2(sd, numItems, digestsDefined, alloc)); | |
| 349 MY_ALLOC(UInt32, *digests, numItems, alloc); | |
| 350 for (i = 0; i < numItems; i++) | |
| 351 if ((*digestsDefined)[i]) | |
| 352 { | |
| 353 RINOK(SzReadUInt32(sd, (*digests) + i)); | |
| 354 } | |
| 355 return SZ_OK; | |
| 356 } | |
| 357 | |
| 358 static SRes SzReadPackInfo( | |
| 359 CSzData *sd, | |
| 360 UInt64 *dataOffset, | |
| 361 UInt32 *numPackStreams, | |
| 362 UInt64 **packSizes, | |
| 363 Byte **packCRCsDefined, | |
| 364 UInt32 **packCRCs, | |
| 365 ISzAlloc *alloc) | |
| 366 { | |
| 367 UInt32 i; | |
| 368 RINOK(SzReadNumber(sd, dataOffset)); | |
| 369 RINOK(SzReadNumber32(sd, numPackStreams)); | |
| 370 | |
| 371 RINOK(SzWaitAttribute(sd, k7zIdSize)); | |
| 372 | |
| 373 MY_ALLOC(UInt64, *packSizes, (size_t)*numPackStreams, alloc); | |
| 374 | |
| 375 for (i = 0; i < *numPackStreams; i++) | |
| 376 { | |
| 377 RINOK(SzReadNumber(sd, (*packSizes) + i)); | |
| 378 } | |
| 379 | |
| 380 for (;;) | |
| 381 { | |
| 382 UInt64 type; | |
| 383 RINOK(SzReadID(sd, &type)); | |
| 384 if (type == k7zIdEnd) | |
| 385 break; | |
| 386 if (type == k7zIdCRC) | |
| 387 { | |
| 388 RINOK(SzReadHashDigests(sd, (size_t)*numPackStreams, packCRCsDefined, pack
CRCs, alloc)); | |
| 389 continue; | |
| 390 } | |
| 391 RINOK(SzSkeepData(sd)); | |
| 392 } | |
| 393 if (*packCRCsDefined == 0) | |
| 394 { | |
| 395 MY_ALLOC(Byte, *packCRCsDefined, (size_t)*numPackStreams, alloc); | |
| 396 MY_ALLOC(UInt32, *packCRCs, (size_t)*numPackStreams, alloc); | |
| 397 for (i = 0; i < *numPackStreams; i++) | |
| 398 { | |
| 399 (*packCRCsDefined)[i] = 0; | |
| 400 (*packCRCs)[i] = 0; | |
| 401 } | |
| 402 } | |
| 403 return SZ_OK; | |
| 404 } | |
| 405 | |
| 406 static SRes SzReadSwitch(CSzData *sd) | |
| 407 { | |
| 408 Byte external; | |
| 409 RINOK(SzReadByte(sd, &external)); | |
| 410 return (external == 0) ? SZ_OK: SZ_ERROR_UNSUPPORTED; | |
| 411 } | |
| 412 | |
| 413 static SRes SzGetNextFolderItem(CSzData *sd, CSzFolder *folder, ISzAlloc *alloc) | |
| 414 { | |
| 415 UInt32 numCoders, numBindPairs, numPackStreams, i; | |
| 416 UInt32 numInStreams = 0, numOutStreams = 0; | |
| 417 | |
| 418 RINOK(SzReadNumber32(sd, &numCoders)); | |
| 419 if (numCoders > NUM_FOLDER_CODERS_MAX) | |
| 420 return SZ_ERROR_UNSUPPORTED; | |
| 421 folder->NumCoders = numCoders; | |
| 422 | |
| 423 MY_ALLOC(CSzCoderInfo, folder->Coders, (size_t)numCoders, alloc); | |
| 424 | |
| 425 for (i = 0; i < numCoders; i++) | |
| 426 SzCoderInfo_Init(folder->Coders + i); | |
| 427 | |
| 428 for (i = 0; i < numCoders; i++) | |
| 429 { | |
| 430 Byte mainByte; | |
| 431 CSzCoderInfo *coder = folder->Coders + i; | |
| 432 { | |
| 433 unsigned idSize, j; | |
| 434 Byte longID[15]; | |
| 435 RINOK(SzReadByte(sd, &mainByte)); | |
| 436 idSize = (unsigned)(mainByte & 0xF); | |
| 437 RINOK(SzReadBytes(sd, longID, idSize)); | |
| 438 if (idSize > sizeof(coder->MethodID)) | |
| 439 return SZ_ERROR_UNSUPPORTED; | |
| 440 coder->MethodID = 0; | |
| 441 for (j = 0; j < idSize; j++) | |
| 442 coder->MethodID |= (UInt64)longID[idSize - 1 - j] << (8 * j); | |
| 443 | |
| 444 if ((mainByte & 0x10) != 0) | |
| 445 { | |
| 446 RINOK(SzReadNumber32(sd, &coder->NumInStreams)); | |
| 447 RINOK(SzReadNumber32(sd, &coder->NumOutStreams)); | |
| 448 if (coder->NumInStreams > NUM_CODER_STREAMS_MAX || | |
| 449 coder->NumOutStreams > NUM_CODER_STREAMS_MAX) | |
| 450 return SZ_ERROR_UNSUPPORTED; | |
| 451 } | |
| 452 else | |
| 453 { | |
| 454 coder->NumInStreams = 1; | |
| 455 coder->NumOutStreams = 1; | |
| 456 } | |
| 457 if ((mainByte & 0x20) != 0) | |
| 458 { | |
| 459 UInt64 propertiesSize = 0; | |
| 460 RINOK(SzReadNumber(sd, &propertiesSize)); | |
| 461 if (!Buf_Create(&coder->Props, (size_t)propertiesSize, alloc)) | |
| 462 return SZ_ERROR_MEM; | |
| 463 RINOK(SzReadBytes(sd, coder->Props.data, (size_t)propertiesSize)); | |
| 464 } | |
| 465 } | |
| 466 while ((mainByte & 0x80) != 0) | |
| 467 { | |
| 468 RINOK(SzReadByte(sd, &mainByte)); | |
| 469 RINOK(SzSkeepDataSize(sd, (mainByte & 0xF))); | |
| 470 if ((mainByte & 0x10) != 0) | |
| 471 { | |
| 472 UInt32 n; | |
| 473 RINOK(SzReadNumber32(sd, &n)); | |
| 474 RINOK(SzReadNumber32(sd, &n)); | |
| 475 } | |
| 476 if ((mainByte & 0x20) != 0) | |
| 477 { | |
| 478 UInt64 propertiesSize = 0; | |
| 479 RINOK(SzReadNumber(sd, &propertiesSize)); | |
| 480 RINOK(SzSkeepDataSize(sd, propertiesSize)); | |
| 481 } | |
| 482 } | |
| 483 numInStreams += coder->NumInStreams; | |
| 484 numOutStreams += coder->NumOutStreams; | |
| 485 } | |
| 486 | |
| 487 if (numOutStreams == 0) | |
| 488 return SZ_ERROR_UNSUPPORTED; | |
| 489 | |
| 490 folder->NumBindPairs = numBindPairs = numOutStreams - 1; | |
| 491 MY_ALLOC(CBindPair, folder->BindPairs, (size_t)numBindPairs, alloc); | |
| 492 | |
| 493 for (i = 0; i < numBindPairs; i++) | |
| 494 { | |
| 495 CBindPair *bp = folder->BindPairs + i; | |
| 496 RINOK(SzReadNumber32(sd, &bp->InIndex)); | |
| 497 RINOK(SzReadNumber32(sd, &bp->OutIndex)); | |
| 498 } | |
| 499 | |
| 500 if (numInStreams < numBindPairs) | |
| 501 return SZ_ERROR_UNSUPPORTED; | |
| 502 | |
| 503 folder->NumPackStreams = numPackStreams = numInStreams - numBindPairs; | |
| 504 MY_ALLOC(UInt32, folder->PackStreams, (size_t)numPackStreams, alloc); | |
| 505 | |
| 506 if (numPackStreams == 1) | |
| 507 { | |
| 508 for (i = 0; i < numInStreams ; i++) | |
| 509 if (SzFolder_FindBindPairForInStream(folder, i) < 0) | |
| 510 break; | |
| 511 if (i == numInStreams) | |
| 512 return SZ_ERROR_UNSUPPORTED; | |
| 513 folder->PackStreams[0] = i; | |
| 514 } | |
| 515 else | |
| 516 for (i = 0; i < numPackStreams; i++) | |
| 517 { | |
| 518 RINOK(SzReadNumber32(sd, folder->PackStreams + i)); | |
| 519 } | |
| 520 return SZ_OK; | |
| 521 } | |
| 522 | |
| 523 static SRes SzReadUnpackInfo( | |
| 524 CSzData *sd, | |
| 525 UInt32 *numFolders, | |
| 526 CSzFolder **folders, /* for alloc */ | |
| 527 ISzAlloc *alloc, | |
| 528 ISzAlloc *allocTemp) | |
| 529 { | |
| 530 UInt32 i; | |
| 531 RINOK(SzWaitAttribute(sd, k7zIdFolder)); | |
| 532 RINOK(SzReadNumber32(sd, numFolders)); | |
| 533 { | |
| 534 RINOK(SzReadSwitch(sd)); | |
| 535 | |
| 536 MY_ALLOC(CSzFolder, *folders, (size_t)*numFolders, alloc); | |
| 537 | |
| 538 for (i = 0; i < *numFolders; i++) | |
| 539 SzFolder_Init((*folders) + i); | |
| 540 | |
| 541 for (i = 0; i < *numFolders; i++) | |
| 542 { | |
| 543 RINOK(SzGetNextFolderItem(sd, (*folders) + i, alloc)); | |
| 544 } | |
| 545 } | |
| 546 | |
| 547 RINOK(SzWaitAttribute(sd, k7zIdCodersUnpackSize)); | |
| 548 | |
| 549 for (i = 0; i < *numFolders; i++) | |
| 550 { | |
| 551 UInt32 j; | |
| 552 CSzFolder *folder = (*folders) + i; | |
| 553 UInt32 numOutStreams = SzFolder_GetNumOutStreams(folder); | |
| 554 | |
| 555 MY_ALLOC(UInt64, folder->UnpackSizes, (size_t)numOutStreams, alloc); | |
| 556 | |
| 557 for (j = 0; j < numOutStreams; j++) | |
| 558 { | |
| 559 RINOK(SzReadNumber(sd, folder->UnpackSizes + j)); | |
| 560 } | |
| 561 } | |
| 562 | |
| 563 for (;;) | |
| 564 { | |
| 565 UInt64 type; | |
| 566 RINOK(SzReadID(sd, &type)); | |
| 567 if (type == k7zIdEnd) | |
| 568 return SZ_OK; | |
| 569 if (type == k7zIdCRC) | |
| 570 { | |
| 571 SRes res; | |
| 572 Byte *crcsDefined = 0; | |
| 573 UInt32 *crcs = 0; | |
| 574 res = SzReadHashDigests(sd, *numFolders, &crcsDefined, &crcs, allocTemp); | |
| 575 if (res == SZ_OK) | |
| 576 { | |
| 577 for (i = 0; i < *numFolders; i++) | |
| 578 { | |
| 579 CSzFolder *folder = (*folders) + i; | |
| 580 folder->UnpackCRCDefined = crcsDefined[i]; | |
| 581 folder->UnpackCRC = crcs[i]; | |
| 582 } | |
| 583 } | |
| 584 IAlloc_Free(allocTemp, crcs); | |
| 585 IAlloc_Free(allocTemp, crcsDefined); | |
| 586 RINOK(res); | |
| 587 continue; | |
| 588 } | |
| 589 RINOK(SzSkeepData(sd)); | |
| 590 } | |
| 591 } | |
| 592 | |
| 593 static SRes SzReadSubStreamsInfo( | |
| 594 CSzData *sd, | |
| 595 UInt32 numFolders, | |
| 596 CSzFolder *folders, | |
| 597 UInt32 *numUnpackStreams, | |
| 598 UInt64 **unpackSizes, | |
| 599 Byte **digestsDefined, | |
| 600 UInt32 **digests, | |
| 601 ISzAlloc *allocTemp) | |
| 602 { | |
| 603 UInt64 type = 0; | |
| 604 UInt32 i; | |
| 605 UInt32 si = 0; | |
| 606 UInt32 numDigests = 0; | |
| 607 | |
| 608 for (i = 0; i < numFolders; i++) | |
| 609 folders[i].NumUnpackStreams = 1; | |
| 610 *numUnpackStreams = numFolders; | |
| 611 | |
| 612 for (;;) | |
| 613 { | |
| 614 RINOK(SzReadID(sd, &type)); | |
| 615 if (type == k7zIdNumUnpackStream) | |
| 616 { | |
| 617 *numUnpackStreams = 0; | |
| 618 for (i = 0; i < numFolders; i++) | |
| 619 { | |
| 620 UInt32 numStreams; | |
| 621 RINOK(SzReadNumber32(sd, &numStreams)); | |
| 622 folders[i].NumUnpackStreams = numStreams; | |
| 623 *numUnpackStreams += numStreams; | |
| 624 } | |
| 625 continue; | |
| 626 } | |
| 627 if (type == k7zIdCRC || type == k7zIdSize) | |
| 628 break; | |
| 629 if (type == k7zIdEnd) | |
| 630 break; | |
| 631 RINOK(SzSkeepData(sd)); | |
| 632 } | |
| 633 | |
| 634 if (*numUnpackStreams == 0) | |
| 635 { | |
| 636 *unpackSizes = 0; | |
| 637 *digestsDefined = 0; | |
| 638 *digests = 0; | |
| 639 } | |
| 640 else | |
| 641 { | |
| 642 *unpackSizes = (UInt64 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams *
sizeof(UInt64)); | |
| 643 RINOM(*unpackSizes); | |
| 644 *digestsDefined = (Byte *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams
* sizeof(Byte)); | |
| 645 RINOM(*digestsDefined); | |
| 646 *digests = (UInt32 *)IAlloc_Alloc(allocTemp, (size_t)*numUnpackStreams * siz
eof(UInt32)); | |
| 647 RINOM(*digests); | |
| 648 } | |
| 649 | |
| 650 for (i = 0; i < numFolders; i++) | |
| 651 { | |
| 652 /* | |
| 653 v3.13 incorrectly worked with empty folders | |
| 654 v4.07: we check that folder is empty | |
| 655 */ | |
| 656 UInt64 sum = 0; | |
| 657 UInt32 j; | |
| 658 UInt32 numSubstreams = folders[i].NumUnpackStreams; | |
| 659 if (numSubstreams == 0) | |
| 660 continue; | |
| 661 if (type == k7zIdSize) | |
| 662 for (j = 1; j < numSubstreams; j++) | |
| 663 { | |
| 664 UInt64 size; | |
| 665 RINOK(SzReadNumber(sd, &size)); | |
| 666 (*unpackSizes)[si++] = size; | |
| 667 sum += size; | |
| 668 } | |
| 669 (*unpackSizes)[si++] = SzFolder_GetUnpackSize(folders + i) - sum; | |
| 670 } | |
| 671 if (type == k7zIdSize) | |
| 672 { | |
| 673 RINOK(SzReadID(sd, &type)); | |
| 674 } | |
| 675 | |
| 676 for (i = 0; i < *numUnpackStreams; i++) | |
| 677 { | |
| 678 (*digestsDefined)[i] = 0; | |
| 679 (*digests)[i] = 0; | |
| 680 } | |
| 681 | |
| 682 | |
| 683 for (i = 0; i < numFolders; i++) | |
| 684 { | |
| 685 UInt32 numSubstreams = folders[i].NumUnpackStreams; | |
| 686 if (numSubstreams != 1 || !folders[i].UnpackCRCDefined) | |
| 687 numDigests += numSubstreams; | |
| 688 } | |
| 689 | |
| 690 | |
| 691 si = 0; | |
| 692 for (;;) | |
| 693 { | |
| 694 if (type == k7zIdCRC) | |
| 695 { | |
| 696 int digestIndex = 0; | |
| 697 Byte *digestsDefined2 = 0; | |
| 698 UInt32 *digests2 = 0; | |
| 699 SRes res = SzReadHashDigests(sd, numDigests, &digestsDefined2, &digests2,
allocTemp); | |
| 700 if (res == SZ_OK) | |
| 701 { | |
| 702 for (i = 0; i < numFolders; i++) | |
| 703 { | |
| 704 CSzFolder *folder = folders + i; | |
| 705 UInt32 numSubstreams = folder->NumUnpackStreams; | |
| 706 if (numSubstreams == 1 && folder->UnpackCRCDefined) | |
| 707 { | |
| 708 (*digestsDefined)[si] = 1; | |
| 709 (*digests)[si] = folder->UnpackCRC; | |
| 710 si++; | |
| 711 } | |
| 712 else | |
| 713 { | |
| 714 UInt32 j; | |
| 715 for (j = 0; j < numSubstreams; j++, digestIndex++) | |
| 716 { | |
| 717 (*digestsDefined)[si] = digestsDefined2[digestIndex]; | |
| 718 (*digests)[si] = digests2[digestIndex]; | |
| 719 si++; | |
| 720 } | |
| 721 } | |
| 722 } | |
| 723 } | |
| 724 IAlloc_Free(allocTemp, digestsDefined2); | |
| 725 IAlloc_Free(allocTemp, digests2); | |
| 726 RINOK(res); | |
| 727 } | |
| 728 else if (type == k7zIdEnd) | |
| 729 return SZ_OK; | |
| 730 else | |
| 731 { | |
| 732 RINOK(SzSkeepData(sd)); | |
| 733 } | |
| 734 RINOK(SzReadID(sd, &type)); | |
| 735 } | |
| 736 } | |
| 737 | |
| 738 | |
| 739 static SRes SzReadStreamsInfo( | |
| 740 CSzData *sd, | |
| 741 UInt64 *dataOffset, | |
| 742 CSzAr *p, | |
| 743 UInt32 *numUnpackStreams, | |
| 744 UInt64 **unpackSizes, /* allocTemp */ | |
| 745 Byte **digestsDefined, /* allocTemp */ | |
| 746 UInt32 **digests, /* allocTemp */ | |
| 747 ISzAlloc *alloc, | |
| 748 ISzAlloc *allocTemp) | |
| 749 { | |
| 750 for (;;) | |
| 751 { | |
| 752 UInt64 type; | |
| 753 RINOK(SzReadID(sd, &type)); | |
| 754 if ((UInt64)(int)type != type) | |
| 755 return SZ_ERROR_UNSUPPORTED; | |
| 756 switch((int)type) | |
| 757 { | |
| 758 case k7zIdEnd: | |
| 759 return SZ_OK; | |
| 760 case k7zIdPackInfo: | |
| 761 { | |
| 762 RINOK(SzReadPackInfo(sd, dataOffset, &p->NumPackStreams, | |
| 763 &p->PackSizes, &p->PackCRCsDefined, &p->PackCRCs, alloc)); | |
| 764 break; | |
| 765 } | |
| 766 case k7zIdUnpackInfo: | |
| 767 { | |
| 768 RINOK(SzReadUnpackInfo(sd, &p->NumFolders, &p->Folders, alloc, allocTemp
)); | |
| 769 break; | |
| 770 } | |
| 771 case k7zIdSubStreamsInfo: | |
| 772 { | |
| 773 RINOK(SzReadSubStreamsInfo(sd, p->NumFolders, p->Folders, | |
| 774 numUnpackStreams, unpackSizes, digestsDefined, digests, allocTemp)); | |
| 775 break; | |
| 776 } | |
| 777 default: | |
| 778 return SZ_ERROR_UNSUPPORTED; | |
| 779 } | |
| 780 } | |
| 781 } | |
| 782 | |
| 783 Byte kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; | |
| 784 | |
| 785 static SRes SzReadFileNames(CSzData *sd, UInt32 numFiles, CSzFileItem *files, IS
zAlloc *alloc) | |
| 786 { | |
| 787 UInt32 i; | |
| 788 for (i = 0; i < numFiles; i++) | |
| 789 { | |
| 790 UInt32 len = 0; | |
| 791 UInt32 pos = 0; | |
| 792 CSzFileItem *file = files + i; | |
| 793 while (pos + 2 <= sd->Size) | |
| 794 { | |
| 795 int numAdds; | |
| 796 UInt32 value = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8)
); | |
| 797 pos += 2; | |
| 798 len++; | |
| 799 if (value == 0) | |
| 800 break; | |
| 801 if (value < 0x80) | |
| 802 continue; | |
| 803 if (value >= 0xD800 && value < 0xE000) | |
| 804 { | |
| 805 UInt32 c2; | |
| 806 if (value >= 0xDC00) | |
| 807 return SZ_ERROR_ARCHIVE; | |
| 808 if (pos + 2 > sd->Size) | |
| 809 return SZ_ERROR_ARCHIVE; | |
| 810 c2 = (UInt32)(sd->Data[pos] | (((UInt32)sd->Data[pos + 1]) << 8)); | |
| 811 pos += 2; | |
| 812 if (c2 < 0xDC00 || c2 >= 0xE000) | |
| 813 return SZ_ERROR_ARCHIVE; | |
| 814 value = ((value - 0xD800) << 10) | (c2 - 0xDC00); | |
| 815 } | |
| 816 for (numAdds = 1; numAdds < 5; numAdds++) | |
| 817 if (value < (((UInt32)1) << (numAdds * 5 + 6))) | |
| 818 break; | |
| 819 len += numAdds; | |
| 820 } | |
| 821 | |
| 822 MY_ALLOC(char, file->Name, (size_t)len, alloc); | |
| 823 | |
| 824 len = 0; | |
| 825 while (2 <= sd->Size) | |
| 826 { | |
| 827 int numAdds; | |
| 828 UInt32 value = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8)); | |
| 829 SzSkeepDataSize(sd, 2); | |
| 830 if (value < 0x80) | |
| 831 { | |
| 832 file->Name[len++] = (char)value; | |
| 833 if (value == 0) | |
| 834 break; | |
| 835 continue; | |
| 836 } | |
| 837 if (value >= 0xD800 && value < 0xE000) | |
| 838 { | |
| 839 UInt32 c2 = (UInt32)(sd->Data[0] | (((UInt32)sd->Data[1]) << 8)); | |
| 840 SzSkeepDataSize(sd, 2); | |
| 841 value = ((value - 0xD800) << 10) | (c2 - 0xDC00); | |
| 842 } | |
| 843 for (numAdds = 1; numAdds < 5; numAdds++) | |
| 844 if (value < (((UInt32)1) << (numAdds * 5 + 6))) | |
| 845 break; | |
| 846 file->Name[len++] = (char)(kUtf8Limits[numAdds - 1] + (value >> (6 * numAd
ds))); | |
| 847 do | |
| 848 { | |
| 849 numAdds--; | |
| 850 file->Name[len++] = (char)(0x80 + ((value >> (6 * numAdds)) & 0x3F)); | |
| 851 } | |
| 852 while (numAdds > 0); | |
| 853 | |
| 854 len += numAdds; | |
| 855 } | |
| 856 } | |
| 857 return SZ_OK; | |
| 858 } | |
| 859 | |
| 860 static SRes SzReadHeader2( | |
| 861 CSzArEx *p, /* allocMain */ | |
| 862 CSzData *sd, | |
| 863 UInt64 **unpackSizes, /* allocTemp */ | |
| 864 Byte **digestsDefined, /* allocTemp */ | |
| 865 UInt32 **digests, /* allocTemp */ | |
| 866 Byte **emptyStreamVector, /* allocTemp */ | |
| 867 Byte **emptyFileVector, /* allocTemp */ | |
| 868 Byte **lwtVector, /* allocTemp */ | |
| 869 ISzAlloc *allocMain, | |
| 870 ISzAlloc *allocTemp) | |
| 871 { | |
| 872 UInt64 type; | |
| 873 UInt32 numUnpackStreams = 0; | |
| 874 UInt32 numFiles = 0; | |
| 875 CSzFileItem *files = 0; | |
| 876 UInt32 numEmptyStreams = 0; | |
| 877 UInt32 i; | |
| 878 | |
| 879 RINOK(SzReadID(sd, &type)); | |
| 880 | |
| 881 if (type == k7zIdArchiveProperties) | |
| 882 { | |
| 883 RINOK(SzReadArchiveProperties(sd)); | |
| 884 RINOK(SzReadID(sd, &type)); | |
| 885 } | |
| 886 | |
| 887 | |
| 888 if (type == k7zIdMainStreamsInfo) | |
| 889 { | |
| 890 RINOK(SzReadStreamsInfo(sd, | |
| 891 &p->dataPos, | |
| 892 &p->db, | |
| 893 &numUnpackStreams, | |
| 894 unpackSizes, | |
| 895 digestsDefined, | |
| 896 digests, allocMain, allocTemp)); | |
| 897 p->dataPos += p->startPosAfterHeader; | |
| 898 RINOK(SzReadID(sd, &type)); | |
| 899 } | |
| 900 | |
| 901 if (type == k7zIdEnd) | |
| 902 return SZ_OK; | |
| 903 if (type != k7zIdFilesInfo) | |
| 904 return SZ_ERROR_ARCHIVE; | |
| 905 | |
| 906 RINOK(SzReadNumber32(sd, &numFiles)); | |
| 907 p->db.NumFiles = numFiles; | |
| 908 | |
| 909 MY_ALLOC(CSzFileItem, files, (size_t)numFiles, allocMain); | |
| 910 | |
| 911 p->db.Files = files; | |
| 912 for (i = 0; i < numFiles; i++) | |
| 913 SzFile_Init(files + i); | |
| 914 | |
| 915 for (;;) | |
| 916 { | |
| 917 UInt64 type; | |
| 918 UInt64 size; | |
| 919 RINOK(SzReadID(sd, &type)); | |
| 920 if (type == k7zIdEnd) | |
| 921 break; | |
| 922 RINOK(SzReadNumber(sd, &size)); | |
| 923 | |
| 924 if ((UInt64)(int)type != type) | |
| 925 { | |
| 926 RINOK(SzSkeepDataSize(sd, size)); | |
| 927 } | |
| 928 else | |
| 929 switch((int)type) | |
| 930 { | |
| 931 case k7zIdName: | |
| 932 { | |
| 933 RINOK(SzReadSwitch(sd)); | |
| 934 RINOK(SzReadFileNames(sd, numFiles, files, allocMain)) | |
| 935 break; | |
| 936 } | |
| 937 case k7zIdEmptyStream: | |
| 938 { | |
| 939 RINOK(SzReadBoolVector(sd, numFiles, emptyStreamVector, allocTemp)); | |
| 940 numEmptyStreams = 0; | |
| 941 for (i = 0; i < numFiles; i++) | |
| 942 if ((*emptyStreamVector)[i]) | |
| 943 numEmptyStreams++; | |
| 944 break; | |
| 945 } | |
| 946 case k7zIdEmptyFile: | |
| 947 { | |
| 948 RINOK(SzReadBoolVector(sd, numEmptyStreams, emptyFileVector, allocTemp))
; | |
| 949 break; | |
| 950 } | |
| 951 case k7zIdMTime: | |
| 952 { | |
| 953 RINOK(SzReadBoolVector2(sd, numFiles, lwtVector, allocTemp)); | |
| 954 RINOK(SzReadSwitch(sd)); | |
| 955 for (i = 0; i < numFiles; i++) | |
| 956 { | |
| 957 CSzFileItem *f = &files[i]; | |
| 958 Byte defined = (*lwtVector)[i]; | |
| 959 f->MTimeDefined = defined; | |
| 960 f->MTime.Low = f->MTime.High = 0; | |
| 961 if (defined) | |
| 962 { | |
| 963 RINOK(SzReadUInt32(sd, &f->MTime.Low)); | |
| 964 RINOK(SzReadUInt32(sd, &f->MTime.High)); | |
| 965 } | |
| 966 } | |
| 967 break; | |
| 968 } | |
| 969 default: | |
| 970 { | |
| 971 RINOK(SzSkeepDataSize(sd, size)); | |
| 972 } | |
| 973 } | |
| 974 } | |
| 975 | |
| 976 { | |
| 977 UInt32 emptyFileIndex = 0; | |
| 978 UInt32 sizeIndex = 0; | |
| 979 for (i = 0; i < numFiles; i++) | |
| 980 { | |
| 981 CSzFileItem *file = files + i; | |
| 982 file->IsAnti = 0; | |
| 983 if (*emptyStreamVector == 0) | |
| 984 file->HasStream = 1; | |
| 985 else | |
| 986 file->HasStream = (Byte)((*emptyStreamVector)[i] ? 0 : 1); | |
| 987 if (file->HasStream) | |
| 988 { | |
| 989 file->IsDir = 0; | |
| 990 file->Size = (*unpackSizes)[sizeIndex]; | |
| 991 file->FileCRC = (*digests)[sizeIndex]; | |
| 992 file->FileCRCDefined = (Byte)(*digestsDefined)[sizeIndex]; | |
| 993 sizeIndex++; | |
| 994 } | |
| 995 else | |
| 996 { | |
| 997 if (*emptyFileVector == 0) | |
| 998 file->IsDir = 1; | |
| 999 else | |
| 1000 file->IsDir = (Byte)((*emptyFileVector)[emptyFileIndex] ? 0 : 1); | |
| 1001 emptyFileIndex++; | |
| 1002 file->Size = 0; | |
| 1003 file->FileCRCDefined = 0; | |
| 1004 } | |
| 1005 } | |
| 1006 } | |
| 1007 return SzArEx_Fill(p, allocMain); | |
| 1008 } | |
| 1009 | |
| 1010 static SRes SzReadHeader( | |
| 1011 CSzArEx *p, | |
| 1012 CSzData *sd, | |
| 1013 ISzAlloc *allocMain, | |
| 1014 ISzAlloc *allocTemp) | |
| 1015 { | |
| 1016 UInt64 *unpackSizes = 0; | |
| 1017 Byte *digestsDefined = 0; | |
| 1018 UInt32 *digests = 0; | |
| 1019 Byte *emptyStreamVector = 0; | |
| 1020 Byte *emptyFileVector = 0; | |
| 1021 Byte *lwtVector = 0; | |
| 1022 SRes res = SzReadHeader2(p, sd, | |
| 1023 &unpackSizes, &digestsDefined, &digests, | |
| 1024 &emptyStreamVector, &emptyFileVector, &lwtVector, | |
| 1025 allocMain, allocTemp); | |
| 1026 IAlloc_Free(allocTemp, unpackSizes); | |
| 1027 IAlloc_Free(allocTemp, digestsDefined); | |
| 1028 IAlloc_Free(allocTemp, digests); | |
| 1029 IAlloc_Free(allocTemp, emptyStreamVector); | |
| 1030 IAlloc_Free(allocTemp, emptyFileVector); | |
| 1031 IAlloc_Free(allocTemp, lwtVector); | |
| 1032 return res; | |
| 1033 } | |
| 1034 | |
| 1035 static SRes SzReadAndDecodePackedStreams2( | |
| 1036 ILookInStream *inStream, | |
| 1037 CSzData *sd, | |
| 1038 CBuf *outBuffer, | |
| 1039 UInt64 baseOffset, | |
| 1040 CSzAr *p, | |
| 1041 UInt64 **unpackSizes, | |
| 1042 Byte **digestsDefined, | |
| 1043 UInt32 **digests, | |
| 1044 ISzAlloc *allocTemp) | |
| 1045 { | |
| 1046 | |
| 1047 UInt32 numUnpackStreams = 0; | |
| 1048 UInt64 dataStartPos; | |
| 1049 CSzFolder *folder; | |
| 1050 UInt64 unpackSize; | |
| 1051 SRes res; | |
| 1052 | |
| 1053 RINOK(SzReadStreamsInfo(sd, &dataStartPos, p, | |
| 1054 &numUnpackStreams, unpackSizes, digestsDefined, digests, | |
| 1055 allocTemp, allocTemp)); | |
| 1056 | |
| 1057 dataStartPos += baseOffset; | |
| 1058 if (p->NumFolders != 1) | |
| 1059 return SZ_ERROR_ARCHIVE; | |
| 1060 | |
| 1061 folder = p->Folders; | |
| 1062 unpackSize = SzFolder_GetUnpackSize(folder); | |
| 1063 | |
| 1064 RINOK(LookInStream_SeekTo(inStream, dataStartPos)); | |
| 1065 | |
| 1066 if (!Buf_Create(outBuffer, (size_t)unpackSize, allocTemp)) | |
| 1067 return SZ_ERROR_MEM; | |
| 1068 | |
| 1069 res = SzDecode(p->PackSizes, folder, | |
| 1070 inStream, dataStartPos, | |
| 1071 outBuffer->data, (size_t)unpackSize, allocTemp); | |
| 1072 RINOK(res); | |
| 1073 if (folder->UnpackCRCDefined) | |
| 1074 if (CrcCalc(outBuffer->data, (size_t)unpackSize) != folder->UnpackCRC) | |
| 1075 return SZ_ERROR_CRC; | |
| 1076 return SZ_OK; | |
| 1077 } | |
| 1078 | |
| 1079 static SRes SzReadAndDecodePackedStreams( | |
| 1080 ILookInStream *inStream, | |
| 1081 CSzData *sd, | |
| 1082 CBuf *outBuffer, | |
| 1083 UInt64 baseOffset, | |
| 1084 ISzAlloc *allocTemp) | |
| 1085 { | |
| 1086 CSzAr p; | |
| 1087 UInt64 *unpackSizes = 0; | |
| 1088 Byte *digestsDefined = 0; | |
| 1089 UInt32 *digests = 0; | |
| 1090 SRes res; | |
| 1091 SzAr_Init(&p); | |
| 1092 res = SzReadAndDecodePackedStreams2(inStream, sd, outBuffer, baseOffset, | |
| 1093 &p, &unpackSizes, &digestsDefined, &digests, | |
| 1094 allocTemp); | |
| 1095 SzAr_Free(&p, allocTemp); | |
| 1096 IAlloc_Free(allocTemp, unpackSizes); | |
| 1097 IAlloc_Free(allocTemp, digestsDefined); | |
| 1098 IAlloc_Free(allocTemp, digests); | |
| 1099 return res; | |
| 1100 } | |
| 1101 | |
| 1102 static SRes SzArEx_Open2( | |
| 1103 CSzArEx *p, | |
| 1104 ILookInStream *inStream, | |
| 1105 ISzAlloc *allocMain, | |
| 1106 ISzAlloc *allocTemp) | |
| 1107 { | |
| 1108 Byte header[k7zStartHeaderSize]; | |
| 1109 UInt64 nextHeaderOffset, nextHeaderSize; | |
| 1110 size_t nextHeaderSizeT; | |
| 1111 UInt32 nextHeaderCRC; | |
| 1112 CBuf buffer; | |
| 1113 SRes res; | |
| 1114 | |
| 1115 RINOK(LookInStream_Read2(inStream, header, k7zStartHeaderSize, SZ_ERROR_NO_ARC
HIVE)); | |
| 1116 | |
| 1117 if (!TestSignatureCandidate(header)) | |
| 1118 return SZ_ERROR_NO_ARCHIVE; | |
| 1119 if (header[6] != k7zMajorVersion) | |
| 1120 return SZ_ERROR_UNSUPPORTED; | |
| 1121 | |
| 1122 nextHeaderOffset = GetUi64(header + 12); | |
| 1123 nextHeaderSize = GetUi64(header + 20); | |
| 1124 nextHeaderCRC = GetUi32(header + 28); | |
| 1125 | |
| 1126 p->startPosAfterHeader = k7zStartHeaderSize; | |
| 1127 | |
| 1128 if (CrcCalc(header + 12, 20) != GetUi32(header + 8)) | |
| 1129 return SZ_ERROR_CRC; | |
| 1130 | |
| 1131 nextHeaderSizeT = (size_t)nextHeaderSize; | |
| 1132 if (nextHeaderSizeT != nextHeaderSize) | |
| 1133 return SZ_ERROR_MEM; | |
| 1134 if (nextHeaderSizeT == 0) | |
| 1135 return SZ_OK; | |
| 1136 if (nextHeaderOffset > nextHeaderOffset + nextHeaderSize || | |
| 1137 nextHeaderOffset > nextHeaderOffset + nextHeaderSize + k7zStartHeaderSize) | |
| 1138 return SZ_ERROR_NO_ARCHIVE; | |
| 1139 | |
| 1140 { | |
| 1141 Int64 pos = 0; | |
| 1142 RINOK(inStream->Seek(inStream, &pos, SZ_SEEK_END)); | |
| 1143 if ((UInt64)pos < nextHeaderOffset || | |
| 1144 (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset || | |
| 1145 (UInt64)pos < k7zStartHeaderSize + nextHeaderOffset + nextHeaderSize) | |
| 1146 return SZ_ERROR_INPUT_EOF; | |
| 1147 } | |
| 1148 | |
| 1149 RINOK(LookInStream_SeekTo(inStream, k7zStartHeaderSize + nextHeaderOffset)); | |
| 1150 | |
| 1151 if (!Buf_Create(&buffer, nextHeaderSizeT, allocTemp)) | |
| 1152 return SZ_ERROR_MEM; | |
| 1153 | |
| 1154 res = LookInStream_Read(inStream, buffer.data, nextHeaderSizeT); | |
| 1155 if (res == SZ_OK) | |
| 1156 { | |
| 1157 res = SZ_ERROR_ARCHIVE; | |
| 1158 if (CrcCalc(buffer.data, nextHeaderSizeT) == nextHeaderCRC) | |
| 1159 { | |
| 1160 CSzData sd; | |
| 1161 UInt64 type; | |
| 1162 sd.Data = buffer.data; | |
| 1163 sd.Size = buffer.size; | |
| 1164 res = SzReadID(&sd, &type); | |
| 1165 if (res == SZ_OK) | |
| 1166 { | |
| 1167 if (type == k7zIdEncodedHeader) | |
| 1168 { | |
| 1169 CBuf outBuffer; | |
| 1170 Buf_Init(&outBuffer); | |
| 1171 res = SzReadAndDecodePackedStreams(inStream, &sd, &outBuffer, p->start
PosAfterHeader, allocTemp); | |
| 1172 if (res != SZ_OK) | |
| 1173 Buf_Free(&outBuffer, allocTemp); | |
| 1174 else | |
| 1175 { | |
| 1176 Buf_Free(&buffer, allocTemp); | |
| 1177 buffer.data = outBuffer.data; | |
| 1178 buffer.size = outBuffer.size; | |
| 1179 sd.Data = buffer.data; | |
| 1180 sd.Size = buffer.size; | |
| 1181 res = SzReadID(&sd, &type); | |
| 1182 } | |
| 1183 } | |
| 1184 } | |
| 1185 if (res == SZ_OK) | |
| 1186 { | |
| 1187 if (type == k7zIdHeader) | |
| 1188 res = SzReadHeader(p, &sd, allocMain, allocTemp); | |
| 1189 else | |
| 1190 res = SZ_ERROR_UNSUPPORTED; | |
| 1191 } | |
| 1192 } | |
| 1193 } | |
| 1194 Buf_Free(&buffer, allocTemp); | |
| 1195 return res; | |
| 1196 } | |
| 1197 | |
| 1198 SRes SzArEx_Open(CSzArEx *p, ILookInStream *inStream, ISzAlloc *allocMain, ISzAl
loc *allocTemp) | |
| 1199 { | |
| 1200 SRes res = SzArEx_Open2(p, inStream, allocMain, allocTemp); | |
| 1201 if (res != SZ_OK) | |
| 1202 SzArEx_Free(p, allocMain); | |
| 1203 return res; | |
| 1204 } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 624713003:
Keep only base/extractor.[cc|h]. (Closed)
Base URL: https://chromium.googlesource.com/external/omaha.git@master