file_sys/content_archive: Detect compressed NCAs (#11047)
This commit is contained in:
		
							parent
							
								
									28598c9090
								
							
						
					
					
						commit
						04868ab9da
					
				
					 2 changed files with 40 additions and 1 deletions
				
			
		|  | @ -57,11 +57,34 @@ struct NCASectionHeaderBlock { | ||||||
| }; | }; | ||||||
| static_assert(sizeof(NCASectionHeaderBlock) == 0x8, "NCASectionHeaderBlock has incorrect size."); | static_assert(sizeof(NCASectionHeaderBlock) == 0x8, "NCASectionHeaderBlock has incorrect size."); | ||||||
| 
 | 
 | ||||||
|  | struct NCABucketInfo { | ||||||
|  |     u64 table_offset; | ||||||
|  |     u64 table_size; | ||||||
|  |     std::array<u8, 0x10> table_header; | ||||||
|  | }; | ||||||
|  | static_assert(sizeof(NCABucketInfo) == 0x20, "NCABucketInfo has incorrect size."); | ||||||
|  | 
 | ||||||
|  | struct NCASparseInfo { | ||||||
|  |     NCABucketInfo bucket; | ||||||
|  |     u64 physical_offset; | ||||||
|  |     u16 generation; | ||||||
|  |     INSERT_PADDING_BYTES_NOINIT(0x6); | ||||||
|  | }; | ||||||
|  | static_assert(sizeof(NCASparseInfo) == 0x30, "NCASparseInfo has incorrect size."); | ||||||
|  | 
 | ||||||
|  | struct NCACompressionInfo { | ||||||
|  |     NCABucketInfo bucket; | ||||||
|  |     INSERT_PADDING_BYTES_NOINIT(0x8); | ||||||
|  | }; | ||||||
|  | static_assert(sizeof(NCACompressionInfo) == 0x28, "NCACompressionInfo has incorrect size."); | ||||||
|  | 
 | ||||||
| struct NCASectionRaw { | struct NCASectionRaw { | ||||||
|     NCASectionHeaderBlock header; |     NCASectionHeaderBlock header; | ||||||
|     std::array<u8, 0x138> block_data; |     std::array<u8, 0x138> block_data; | ||||||
|     std::array<u8, 0x8> section_ctr; |     std::array<u8, 0x8> section_ctr; | ||||||
|     INSERT_PADDING_BYTES_NOINIT(0xB8); |     NCASparseInfo sparse_info; | ||||||
|  |     NCACompressionInfo compression_info; | ||||||
|  |     INSERT_PADDING_BYTES_NOINIT(0x60); | ||||||
| }; | }; | ||||||
| static_assert(sizeof(NCASectionRaw) == 0x200, "NCASectionRaw has incorrect size."); | static_assert(sizeof(NCASectionRaw) == 0x200, "NCASectionRaw has incorrect size."); | ||||||
| 
 | 
 | ||||||
|  | @ -225,6 +248,20 @@ bool NCA::ReadSections(const std::vector<NCASectionHeader>& sections, u64 bktr_b | ||||||
|     for (std::size_t i = 0; i < sections.size(); ++i) { |     for (std::size_t i = 0; i < sections.size(); ++i) { | ||||||
|         const auto& section = sections[i]; |         const auto& section = sections[i]; | ||||||
| 
 | 
 | ||||||
|  |         if (section.raw.sparse_info.bucket.table_offset != 0 && | ||||||
|  |             section.raw.sparse_info.bucket.table_size != 0) { | ||||||
|  |             LOG_ERROR(Loader, "Sparse NCAs are not supported."); | ||||||
|  |             status = Loader::ResultStatus::ErrorSparseNCA; | ||||||
|  |             return false; | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|  |         if (section.raw.compression_info.bucket.table_offset != 0 && | ||||||
|  |             section.raw.compression_info.bucket.table_size != 0) { | ||||||
|  |             LOG_ERROR(Loader, "Compressed NCAs are not supported."); | ||||||
|  |             status = Loader::ResultStatus::ErrorCompressedNCA; | ||||||
|  |             return false; | ||||||
|  |         } | ||||||
|  | 
 | ||||||
|         if (section.raw.header.filesystem_type == NCASectionFilesystemType::ROMFS) { |         if (section.raw.header.filesystem_type == NCASectionFilesystemType::ROMFS) { | ||||||
|             if (!ReadRomFSSection(section, header.section_tables[i], bktr_base_ivfc_offset)) { |             if (!ReadRomFSSection(section, header.section_tables[i], bktr_base_ivfc_offset)) { | ||||||
|                 return false; |                 return false; | ||||||
|  |  | ||||||
|  | @ -79,6 +79,8 @@ enum class ResultStatus : u16 { | ||||||
|     ErrorBadPFSHeader, |     ErrorBadPFSHeader, | ||||||
|     ErrorIncorrectPFSFileSize, |     ErrorIncorrectPFSFileSize, | ||||||
|     ErrorBadNCAHeader, |     ErrorBadNCAHeader, | ||||||
|  |     ErrorCompressedNCA, | ||||||
|  |     ErrorSparseNCA, | ||||||
|     ErrorMissingProductionKeyFile, |     ErrorMissingProductionKeyFile, | ||||||
|     ErrorMissingHeaderKey, |     ErrorMissingHeaderKey, | ||||||
|     ErrorIncorrectHeaderKey, |     ErrorIncorrectHeaderKey, | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Tobias
						Tobias