aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛Fix dicformat CRC64 calculation for non user data blocks.

Browse Source
This commit is contained in:
Natalia Portillo
2018-02-05 18:42:25 +00:00
parent 41f703f32c
commit adbf977e89
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DiscImageChef.DiscImages/DiscImageChef.cs
View File

@@ -3623,7 +3623,10 @@ namespace DiscImageChef.DiscImages
lzmaProperties = lzmaBlockStream.Properties; lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close(); lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); Crc64Context cmpCrc = new Crc64Context();
cmpCrc.Update(lzmaProperties);
cmpCrc.Update(blockStream.ToArray());
blockCrc = cmpCrc.Final();
prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
prefixBlock.compression = CompressionType.Lzma; prefixBlock.compression = CompressionType.Lzma;
@@ -3682,7 +3685,10 @@ namespace DiscImageChef.DiscImages
lzmaProperties = lzmaBlockStream.Properties; lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close(); lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); Crc64Context cmpCrc = new Crc64Context();
cmpCrc.Update(lzmaProperties);
cmpCrc.Update(blockStream.ToArray());
blockCrc = cmpCrc.Final();
prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; prefixBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); prefixBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
prefixBlock.compression = CompressionType.Lzma; prefixBlock.compression = CompressionType.Lzma;
@@ -3747,7 +3753,10 @@ namespace DiscImageChef.DiscImages
lzmaProperties = lzmaBlockStream.Properties; lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close(); lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); Crc64Context cmpCrc = new Crc64Context();
cmpCrc.Update(lzmaProperties);
cmpCrc.Update(blockStream.ToArray());
blockCrc = cmpCrc.Final();
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
subchannelBlock.compression = CompressionType.Lzma; subchannelBlock.compression = CompressionType.Lzma;
@@ -3919,7 +3928,10 @@ namespace DiscImageChef.DiscImages
lzmaProperties = lzmaBlockStream.Properties; lzmaProperties = lzmaBlockStream.Properties;
lzmaBlockStream.Close(); lzmaBlockStream.Close();
Crc64Context.Data(blockStream.ToArray(), out blockCrc); Crc64Context cmpCrc = new Crc64Context();
cmpCrc.Update(lzmaProperties);
cmpCrc.Update(blockStream.ToArray());
blockCrc = cmpCrc.Final();
subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH; subchannelBlock.cmpLength = (uint)blockStream.Length + LZMA_PROPERTIES_LENGTH;
subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0); subchannelBlock.cmpCrc64 = BitConverter.ToUInt64(blockCrc, 0);
subchannelBlock.compression = CompressionType.Lzma; subchannelBlock.compression = CompressionType.Lzma;