increase resoltuion in api.h (#29)

Ivan G · web-flow · commit 839dc12e863e · 2025-07-10T09:37:00.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,12 +1,12 @@
 ﻿name: '🏦 Build'
 
 env:
-  VERSION: 1.6.3
+  VERSION: 1.7.0
   # PACKAGE_SUFFIX: '-pre.1'
   PACKAGE_SUFFIX: ''
   ASM_VERSION: 1.0.0
   BUILD_TYPE: Release
-  VCPKG_HASH: 0f88ecb8528605f91980b90a2c5bad88e3cb565f
+  VCPKG_HASH: f33cc491c85a7d643c5ab6da1667c1458e6d7abf
 
 on:
   push:
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             name: Linux x64
             arch: x64
             vcpkg_triplet: x64-linux
@@ -39,7 +39,7 @@ jobs:
             vcpkg_config: RelWithDebInfo
             dotnet_rid: linux-musl-x64
             cmake_options: -D CMAKE_C_FLAGS="-static -Os"
-          - os: ubuntu-20.04
+          - os: ubuntu-22.04
             name: Linux ARM
             arch: arm64
             vcpkg_triplet: arm64-linux
@@ -86,11 +86,13 @@ jobs:
       with:
         submodules: true
 
-    - name: Linux ARM
+    - name: Linux ARM (cross-compile deps)
       if: runner.os == 'Linux' && matrix.arch == 'arm64'
       run: |
         sudo apt-get update
-        sudo apt-get --yes install g++-aarch64-linux-gnu pkg-config-aarch64-linux-gnu
+        sudo apt-get --yes install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu pkg-config qemu-user-static
+        # Set PKG_CONFIG_LIBDIR for ARM64 cross-compilation
+        echo "PKG_CONFIG_LIBDIR=/usr/aarch64-linux-gnu/pkgconfig:/usr/lib/aarch64-linux-gnu/pkgconfig" >> $GITHUB_ENV
 
     - uses: friendlyanon/setup-vcpkg@v1
       # seems like the absense of commit hash expects vcpkg submodule, i don't want that
@@ -164,8 +166,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
-            dotnet_rid: linux-x64
           - os: ubuntu-22.04
             dotnet_rid: linux-x64
           - os: windows-2022
@@ -198,7 +198,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
 
     - name: build
@@ -234,7 +233,6 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
 
     - name: Build
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -1,3 +1,9 @@
+## 1.7.0
+
+- Add ` /guard:cf` by @johnthcall in #26.
+- Where possible, increase "buffer size" variable resolution to `int64_t` (#28).
+- Native and managed dependencies upgraded to the latest versions.
+
 ## 1.6.3
 
 - Native build for Linux [musl](https://wiki.musl-libc.org/projects-using-musl.html) runtime.
diff --git a/managed/IronCompress.Benchmarks/IronCompress.Benchmarks.csproj b/managed/IronCompress.Benchmarks/IronCompress.Benchmarks.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.15.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/managed/IronCompress.Test/IronCompress.Test.csproj b/managed/IronCompress.Test/IronCompress.Test.csproj
@@ -3,17 +3,17 @@
     <PropertyGroup>
         <IsPackable>false</IsPackable>
         <LangVersion>latest</LangVersion>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-        <PackageReference Include="xunit" Version="2.9.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/managed/IronCompress/Iron.cs b/managed/IronCompress/Iron.cs
@@ -72,7 +72,7 @@ public Iron(ArrayPool<byte>? allocPool = null) {
         public IronCompressResult Compress(
             Codec codec,
             ReadOnlySpan<byte> input,
-            int? outputLength = null,
+            long? outputLength = null,
             CompressionLevel compressionLevel = CompressionLevel.Optimal) {
 
             if(ForcePlatform != null) { 
@@ -96,7 +96,7 @@ public IronCompressResult Compress(
         public IronCompressResult Decompress(
            Codec codec,
            ReadOnlySpan<byte> input,
-           int? outputLength = null) {
+           long? outputLength = null) {
 
             if(ForcePlatform != null) {
                 if(ForcePlatform == Platform.Native) {
@@ -132,9 +132,9 @@ private IronCompressResult NativeCompressOrDecompress(
             Codec codec,
             ReadOnlySpan<byte> input,
             CompressionLevel compressionLevel,
-            int? outputLength = null) {
+            long? outputLength = null) {
 
-            int len = 0;
+            long len = 0;
             int level = ToNativeCompressionLevel(compressionLevel);
             unsafe {
                 fixed(byte* inputPtr = input) {
@@ -150,9 +150,9 @@ private IronCompressResult NativeCompressOrDecompress(
                         len = outputLength.Value;
                     }
 
-                    byte[] output = _allocPool == null
+                    byte[] output = (_allocPool == null || len > int.MaxValue)
                        ? new byte[len]
-                       : _allocPool.Rent(len);
+                       : _allocPool.Rent((int)len);
 
                     fixed(byte* outputPtr = output) {
                         try {
@@ -181,7 +181,7 @@ private IronCompressResult ManagedCompressOrDecompress(
             Codec codec,
             ReadOnlySpan<byte> input,
             CompressionLevel compressionLevel,
-            int? outputLength = null) {
+            long? outputLength = null) {
 
             byte[] result;
 
diff --git a/managed/IronCompress/IronCompress.csproj b/managed/IronCompress/IronCompress.csproj
@@ -36,13 +36,13 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-        <PackageReference Include="Snappier" Version="1.1.6" />
-        <PackageReference Include="ZstdSharp.Port" Version="0.8.1" />
+        <PackageReference Include="Snappier" Version="1.2.0" />
+        <PackageReference Include="ZstdSharp.Port" Version="0.8.5" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="System.Buffers" Version="4.5.1" />
-        <PackageReference Include="System.Memory" Version="4.5.5" />
+        <PackageReference Include="System.Buffers" Version="4.6.1" />
+        <PackageReference Include="System.Memory" Version="4.6.3" />
     </ItemGroup>
 
     
diff --git a/managed/IronCompress/IronCompressResult.cs b/managed/IronCompress/IronCompressResult.cs
@@ -6,7 +6,7 @@ namespace IronCompress {
     /// </summary>
     public class IronCompressResult : IDisposable {
         private readonly byte[] _data;
-        private readonly int _dataSize;
+        private readonly long _dataSize;
         private ArrayPool<byte>? _arrayPool;
 
         /// <summary>
@@ -15,15 +15,15 @@ public class IronCompressResult : IDisposable {
         /// <param name="data">Data referenced by result.</param>
         /// <param name="dataSize">If data size is difference from input array size, pass the size explicitly.</param>
         /// <param name="arrayPool">When passed, will return to pool on dispose</param>
-        public IronCompressResult(byte[] data, Codec codec, bool nativeUsed, int dataSize = -1, ArrayPool<byte>? arrayPool = null) {
+        public IronCompressResult(byte[] data, Codec codec, bool nativeUsed, long dataSize = -1, ArrayPool<byte>? arrayPool = null) {
             _data = data;
             Codec = codec;
             NativeUsed = nativeUsed;
             _dataSize = dataSize;
             _arrayPool = arrayPool;
         }
 
-        public int Length => _dataSize == -1 ? _data.Length : _dataSize;
+        public long Length => _dataSize == -1 ? _data.Length : _dataSize;
 
         /// <summary>
         /// Compression codec used
@@ -35,8 +35,12 @@ public IronCompressResult(byte[] data, Codec codec, bool nativeUsed, int dataSiz
         /// </summary>
         public bool NativeUsed { get; }
 
+        /// <summary>
+        /// TODO: might overflow
+        /// </summary>
+        /// <returns></returns>
         public Span<byte> AsSpan() =>
-           _data.AsSpan(0, Length);
+           _data.AsSpan(0, (int)Length);
 
         public static implicit operator Span<byte>(IronCompressResult r) => r.AsSpan();
 
diff --git a/managed/IronCompress/Native.cs b/managed/IronCompress/Native.cs
@@ -41,9 +41,9 @@ private static IntPtr DllImportResolver(string libraryName, Assembly assembly, D
         internal static extern unsafe bool iron_compress(bool compress,
             int codec,
             byte* inputBuffer,
-            int inputBufferSize,
+            long inputBufferSize,
             byte* outputBuffer,
-            int* outputBufferSize,
+            long* outputBufferSize,
             int compressionLevel);
 
         [DllImport(LibName)]
diff --git a/native/api.cpp b/native/api.cpp
@@ -34,16 +34,16 @@ bool lzo_initialised{ false };
 bool compress_snappy(
    bool compress,
    char* input_buffer,
-   int input_buffer_size,
+   int64_t input_buffer_size,
    char* output_buffer,
-   int* output_buffer_size) {
+   int64_t* output_buffer_size) {
     if(output_buffer == nullptr) {
         if(compress)
-            *output_buffer_size = snappy::MaxCompressedLength(input_buffer_size);
+            *output_buffer_size = static_cast<int64_t>(snappy::MaxCompressedLength(input_buffer_size));
         else {
             size_t length;
             if(snappy::GetUncompressedLength(input_buffer, input_buffer_size, &length)) {
-                *output_buffer_size = length;
+                *output_buffer_size = static_cast<int64_t>(length);
             } else {
                 *output_buffer_size = 0;
                 return false;
@@ -69,15 +69,15 @@ bool compress_snappy(
 bool compress_zstd(
     bool compress,
     char* input_buffer,
-    int input_buffer_size,
+    int64_t input_buffer_size,
     char* output_buffer,
-    int* output_buffer_size,
+    int64_t* output_buffer_size,
 	compression_level compression_level) {
     if(output_buffer == nullptr) {
         if(compress) {
-            *output_buffer_size = ZSTD_compressBound(input_buffer_size);
+            *output_buffer_size = static_cast<int64_t>(ZSTD_compressBound(input_buffer_size));
         } else {
-            *output_buffer_size = ZSTD_getFrameContentSize(input_buffer, input_buffer_size);
+            *output_buffer_size = static_cast<int64_t>(ZSTD_getFrameContentSize(input_buffer, input_buffer_size));
         }
         return true;
     }
@@ -159,9 +159,9 @@ bool compress_zstd(
 bool compress_brotli(
     bool compress,
     char* input_buffer,
-    int input_buffer_size,
+    int64_t input_buffer_size,
     char* output_buffer,
-    int* output_buffer_size,
+    int64_t* output_buffer_size,
 	compression_level compression_level) {
 
     if(output_buffer == nullptr) {
@@ -201,9 +201,9 @@ bool compress_brotli(
 bool compress_lzo(
    bool compress,
    char* input_buffer,
-   int input_buffer_size,
+   int64_t input_buffer_size,
    char* output_buffer,
-   int* output_buffer_size)
+   int64_t* output_buffer_size)
 {
    //minilzo sample: https://github.com/nemequ/lzo/blob/master/minilzo/testmini.c
 
@@ -272,9 +272,9 @@ bool compress_lzo(
 bool compress_lz4(
     bool compress,
     char* input_buffer,
-    int input_buffer_size,
+    int64_t input_buffer_size,
     char* output_buffer,
-    int* output_buffer_size,
+    int64_t* output_buffer_size,
     compression_level compression_level) {
     if(output_buffer == nullptr) {
         if(compress) {
@@ -304,8 +304,8 @@ bool compress_lz4(
     return false;
 }
 
-bool iron_compress(bool compress, compression_codec codec, char* input_buffer, int32_t input_buffer_size,
-    char* output_buffer, int32_t* output_buffer_size, compression_level compression_level) {
+bool iron_compress(bool compress, compression_codec codec, char* input_buffer, int64_t input_buffer_size,
+    char* output_buffer, int64_t* output_buffer_size, compression_level compression_level) {
 
     if(!iron_is_supported(codec)) return false;
 
diff --git a/native/api.h b/native/api.h
@@ -44,9 +44,9 @@ extern "C"
        bool compress,
        compression_codec codec,
        char* input_buffer,
-       int32_t input_buffer_size,
+       int64_t input_buffer_size,
        char* output_buffer,
-       int32_t* output_buffer_size,
+       int64_t* output_buffer_size,
        compression_level compression_level);
 
     /**
diff --git a/native/test.cpp b/native/test.cpp
@@ -20,7 +20,7 @@ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos
 
 void test_roundtrip(compression_codec codec) {
     vector<char> uncompressed(str1.begin(), str1.end());
-    int32_t compressed_length;
+    int64_t compressed_length;
 
     // find out how much space we need for compression
     bool ok = iron_compress(true, codec,
@@ -43,7 +43,7 @@ void test_roundtrip(compression_codec codec) {
     // decompress
     vector<char> decompressed1;
     decompressed1.resize(uncompressed.size());
-    int32_t decompressed_length = uncompressed.size();
+    int64_t decompressed_length = uncompressed.size();
     ok = iron_compress(false, codec,
         &compressed[0], compressed_length,
         &decompressed1[0], &decompressed_length, compression_level::best);
diff --git a/native/vcpkg-configuration.json b/native/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
     "default-registry": {
         "kind": "git",
-        "baseline": "0f88ecb8528605f91980b90a2c5bad88e3cb565f",
+        "baseline": "f33cc491c85a7d643c5ab6da1667c1458e6d7abf",
         "repository": "https://github.com/microsoft/vcpkg"
     },
     "registries": [
