SabreTools/NDecrypt
1
0
Fork 0
mirror of https://github.com/SabreTools/NDecrypt.git synced 2026-09-22 23:05:08 +00:00
Code Issues 11 Packages Projects Releases 20 Wiki Activity

Fix reading NCCH data in CIA header

Browse Source
This commit is contained in:
Matt Nadareski
2021-09-28 21:48:58 -07:00
parent 20987573f4
commit 9f70eae8be
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
NDecrypt/N3DS/Headers/CIAHeader.cs
View File

@@ -1,4 +1,4 @@
using System;
using System.Collections.Generic;
using System.IO;
namespace NDecrypt.N3DS.Headers
@@ -74,7 +74,7 @@ namespace NDecrypt.N3DS.Headers
/// <summary>
/// Content file data
/// </summary>
public NCCHHeader ContentFileData { get; set; }
public NCCHHeader[] Partitions { get; set; }
/// <summary>
/// Meta file data (Not a necessary component)
@@ -122,13 +122,20 @@ namespace NDecrypt.N3DS.Headers
if (reader.BaseStream.Position % 64 != 0)
reader.BaseStream.Seek(64 - (reader.BaseStream.Position % 64), SeekOrigin.Current);
header.ContentFileData = NCCHHeader.Read(reader, readSignature: true);
if (header.ContentFileData == null)
long startingPosition = reader.BaseStream.Position;
List<NCCHHeader> headers = new List<NCCHHeader>();
while (reader.BaseStream.Position < startingPosition + header.ContentSize)
{
Console.WriteLine($"CIA content file data error: Unable to read NCCH header");
return null;
long initPosition = reader.BaseStream.Position;
NCCHHeader ncchHeader = NCCHHeader.Read(reader, readSignature: true);
if (ncchHeader == null)
break;
headers.Add(ncchHeader);
reader.BaseStream.Seek(initPosition + ncchHeader.ContentSizeInMediaUnits * 0x200, SeekOrigin.Begin);
}
header.Partitions = headers.ToArray();
if (header.MetaSize > 0)
header.MetaFileData = MetaFile.Read(reader);