aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-11-13 16:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Compression] Stop ignoring the status returned by the native Apple LZH, KenCode, ShrinkWrap and Blast functions, returning -1 on error, and fail reading UDIF and NDIF sectors when any of their decompressors fails.

Browse Source
This commit is contained in:
Natalia Portillo
2026-10-08 21:20:35 +01:00
parent 52a15dbcd1
commit de8a2d49ea
6 changed files with 48 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Aaru.Compression/Apple/KenCode.cs
View File

@@ -44,15 +44,15 @@ public partial class KenCode
/// <summary>Decodes a buffer compressed with Apple's LZH</summary>
/// <param name="source">Encoded buffer</param>
/// <param name="destination">Buffer where to write the decoded data</param>
/// <returns>The number of decoded bytes</returns>
/// <returns>The number of decoded bytes, or -1 on error</returns>
public static int DecodeBuffer(byte[] source, byte[] destination)
{
if(!Native.IsSupported) return 0;
nuint destLen = (nuint)destination.Length;
AARU_kencode_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
int res = AARU_kencode_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
return (int)destLen;
return res == 0 ? (int)destLen : -1;
}
}

6
Aaru.Compression/Apple/Lzh.cs
View File

@@ -44,15 +44,15 @@ public partial class Lzh
/// <summary>Decodes a buffer compressed with Apple's LZH</summary>
/// <param name="source">Encoded buffer</param>
/// <param name="destination">Buffer where to write the decoded data</param>
/// <returns>The number of decoded bytes</returns>
/// <returns>The number of decoded bytes, or -1 on error</returns>
public static int DecodeBuffer(byte[] source, byte[] destination)
{
if(!Native.IsSupported) return 0;
nuint destLen = (nuint)destination.Length;
AARU_apple_lzh_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
int res = AARU_apple_lzh_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
return (int)destLen;
return res == 0 ? (int)destLen : -1;
}
}

6
Aaru.Compression/StuffIt/ShrinkWrap.cs
View File

@@ -44,15 +44,15 @@ public partial class ShrinkWrap
/// <summary>Decodes a buffer compressed with ShrinkWrapper's StuffIt</summary>
/// <param name="source">Encoded buffer</param>
/// <param name="destination">Buffer where to write the decoded data</param>
/// <returns>The number of decoded bytes</returns>
/// <returns>The number of decoded bytes, or -1 on error</returns>
public static int DecodeBuffer(byte[] source, byte[] destination)
{
if(!Native.IsSupported) return 0;
nuint destLen = (nuint)destination.Length;
AARU_stuffit_shrinkwrap_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
int res = AARU_stuffit_shrinkwrap_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
return (int)destLen;
return res == 0 ? (int)destLen : -1;
}
}

6
Aaru.Compression/Zip/Blast.cs
View File

@@ -44,15 +44,15 @@ public partial class Blast
/// <summary>Decodes a buffer compressed with PKWARE's Data Compression Library Implode</summary>
/// <param name="source">Encoded buffer</param>
/// <param name="destination">Buffer where to write the decoded data</param>
/// <returns>The number of decoded bytes</returns>
/// <returns>The number of decoded bytes, or -1 on error</returns>
public static int DecodeBuffer(byte[] source, byte[] destination)
{
if(!Native.IsSupported) return 0;
nuint destLen = (nuint)destination.Length;
AARU_zip_blast_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
int res = AARU_zip_blast_decode_buffer(source, (nuint)source.Length, destination, ref destLen);
return (int)destLen;
return res == 0 ? (int)destLen : -1;
}
}

25
Aaru.Images/NDIF/Read.cs
View File

@@ -330,7 +330,10 @@ public sealed partial class Ndif
{
var tmpBuffer = new byte[_bufferSize];
realSize = ADC.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
@@ -340,7 +343,10 @@ public sealed partial class Ndif
{
var tmpBuffer = new byte[_bufferSize];
realSize = Rle.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
@@ -350,7 +356,10 @@ public sealed partial class Ndif
{
var tmpBuffer = new byte[_bufferSize];
realSize = Lzh.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
@@ -360,7 +369,10 @@ public sealed partial class Ndif
{
var tmpBuffer = new byte[_bufferSize];
realSize = KenCode.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
@@ -370,7 +382,10 @@ public sealed partial class Ndif
{
var tmpBuffer = new byte[_bufferSize];
realSize = ShrinkWrap.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;

20
Aaru.Images/UDIF/Read.cs
View File

@@ -541,28 +541,40 @@ public sealed partial class Udif
case CHUNK_TYPE_ADC:
tmpBuffer = new byte[_buffersize];
realSize = ADC.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
case CHUNK_TYPE_RLE:
tmpBuffer = new byte[_buffersize];
realSize = Rle.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
case CHUNK_TYPE_LZH:
tmpBuffer = new byte[_buffersize];
realSize = Lzh.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;
case CHUNK_TYPE_KENCODE:
tmpBuffer = new byte[_buffersize];
realSize = KenCode.DecodeBuffer(cmpBuffer, tmpBuffer);
data = new byte[realSize];
if(realSize < 0) return ErrorNumber.InOutError;
data = new byte[realSize];
Array.Copy(tmpBuffer, 0, data, 0, realSize);
break;