release v1.0.5

- [fix] fix potential overflow in receiving

Author: JasonXuDeveloper

.github/workflows/dotnet.yml

@@ -138,18 +138,11 @@ jobs:
             6.0.x
             2.1.x
 
-      # Restore dependencies
-      - name: Restore dependencies
-        run: dotnet restore
-
-      # Build the solution
-      - name: Build solution
-        run: dotnet build --configuration Release /p:OutputPath=../artifacts
-
       # Push NuGet packages
       - name: Push NuGet Packages
         run: |
           echo "Current directory: $(pwd)"
-          for package in ./artifacts/*.nupkg; do
-            dotnet nuget push "$package" --api-key ${{ secrets.MYTOKEN }} --source https://api.nuget.org/v3/index.json
+          dotnet pack Miku.Core/Miku.Core.csproj  -c Release
+          for package in $(find ./Miku.Core/bin/Release -name "*.nupkg" -print0 | sort -z -u | xargs -0 -n1 echo); do
+            dotnet nuget push "$package" --api-key ${{ secrets.MYTOKEN }} --source https://api.nuget.org/v3/index.json --skip-duplicate
           done

Miku.Core/.AssemblyAttributes

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETStandard,Version=v2.1", FrameworkDisplayName = ".NET Standard 2.1")]

Miku.Core/Miku.Core.csproj

@@ -4,7 +4,7 @@
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>disable</Nullable>
         <LangVersion>9</LangVersion>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <Version>1.0.4</Version>
         <PackageId>Miku</PackageId>
         <Title>Miku</Title>
@@ -14,24 +14,40 @@
         <PackageProjectUrl>https://github.com/JasonXuDeveloper/Miku</PackageProjectUrl>
         <RepositoryUrl>https://github.com/JasonXuDeveloper/Miku</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageTags>ECS</PackageTags>
+        <PackageTags>TCP;Networking;High-Perofrmance</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <BranchName>refs/heads/main</BranchName>
+        <TargetFrameworks>net6.0;netstandard2.1;</TargetFrameworks>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
-        <TargetFrameworks>net6.0;netstandard2.1;</TargetFrameworks>
+        <IncludeSource>true</IncludeSource>
+        <DebugType>embedded</DebugType>
+        <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    </PropertyGroup>
+
+    <!--  for .NET Standard  -->
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
+        <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+    </PropertyGroup>
+    <ItemGroup>
+        <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+    </ItemGroup>
+
+    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
     <ItemGroup>
         <None Include="..\README.md" Pack="true" PackagePath="\"/>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Buffers" Version="4.6.0" />
-      <PackageReference Include="System.Memory" Version="4.6.0" />
-      <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+        <PackageReference Include="System.Buffers" Version="4.6.0"/>
+        <PackageReference Include="System.Memory" Version="4.6.0"/>
+        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0"/>
     </ItemGroup>
 
 </Project>

Miku.Core/NetClient.cs

@@ -297,18 +297,32 @@ private static void Receive(SocketAsyncEventArgs args)
                             }
                             catch (Exception e)
                             {
+                                client._receivedData.Clear();
                                 client.OnError?.Invoke(e);
                                 goto cont_receive;
                             }
                         }
 
                         // still the original data or partially the original data
-                        var offset = Unsafe.ByteOffset(ref MemoryMarshal.GetReference(processedData.Span),
-                            ref MemoryMarshal.GetReference(client._receivedData.WrittenSpan));
+                        ref byte processed = ref MemoryMarshal.GetReference(processedData.Span);
+                        ref byte originalData = ref MemoryMarshal.GetReference(client._receivedData.WrittenSpan);
+                        bool original = Unsafe.IsAddressGreaterThan(ref processed, ref originalData) &&
+                                        Unsafe.IsAddressLessThan(ref processed,
+                                            ref Unsafe.Add(ref originalData, client._receivedData.WrittenCount));
                         // if offset is less than length of _receivedData.WrittenMemory, then it's the original data
-                        if ((long)offset < client._receivedData.WrittenCount)
+                        if (original)
                         {
-                            index = (int)offset + processedData.Length;
+                            IntPtr diff = Unsafe.ByteOffset(
+                                ref Unsafe.Add(ref processed, processedData.Length),
+                                ref originalData);
+                            if (diff.ToInt64() > int.MaxValue)
+                            {
+                                client.OnError?.Invoke(new ArithmeticException("diff is too large"));
+                                client._receivedData.Clear();
+                                goto cont_receive;
+                            }
+
+                            index = diff.ToInt32();
                         }
 
                         // invoke event
@@ -326,7 +340,7 @@ private static void Receive(SocketAsyncEventArgs args)
                         if (leftOver > 0 && index < client._receivedData.WrittenCount && index > 0)
                         {
                             // copy left over data to temp stack memory - faster than array pool
-                            if (leftOver <=1024)
+                            if (leftOver <= 1024)
                             {
                                 client._receivedData.WrittenSpan.Slice(index).CopyTo(tempStackMem);
                                 client._receivedData.Clear();