Fixed security issues with image sharp.

softwareantics · Apr 17, 2024 · 02bed33 · 02bed33
1 parent 3cd5304
commit 02bed33
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/FinalEngine.Examples.Sponza/Program.cs b/FinalEngine.Examples.Sponza/Program.cs
@@ -81,7 +81,7 @@ private static void Main()
 
         var watch = new Stopwatch();
         var watchInvoker = new StopwatchInvoker(watch);
-        var gameTime = new GameTime(watchInvoker, 10000.0f);
+        var gameTime = new GameTime(watchInvoker, 120.0f);
 
         float fieldDepth = 10.0f;
         float fieldWidth = 10.0f;
@@ -189,7 +189,7 @@ private static void Main()
             back,
             front);
 
-        skyboxRenderer.SetSkybox(cubeTexture);
+        //skyboxRenderer.SetSkybox(cubeTexture);
 
         var controller = new ImGuiController(window.ClientSize.Width, window.ClientSize.Height);
 
@@ -223,17 +223,17 @@ private static void Main()
 
             geometryRenderer.Enqueue(model);
 
-            for (var i = 0; i < 5; i++)
-            {
-                for (var j = 0; j < 5; j++)
-                {
-                    lightRenderer.Enqueue(new Light()
-                    {
-                        Type = LightType.Point,
-                        Position = new Vector3((i * 20) - 100, 4, (j * 20) - 50),
-                    });
-                }
-            }
+            ////for (var i = 0; i < 5; i++)
+            ////{
+            ////    for (var j = 0; j < 5; j++)
+            ////    {
+            ////        lightRenderer.Enqueue(new Light()
+            ////        {
+            ////            Type = LightType.Point,
+            ////            Position = new Vector3((i * 20) - 100, 4, (j * 20) - 50),
+            ////        });
+            ////    }
+            ////}
 
             renderingEngine.Render(camera);
 

diff --git a/FinalEngine.Rendering/FinalEngine.Rendering.csproj b/FinalEngine.Rendering/FinalEngine.Rendering.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="AssimpNet" Version="4.1.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/FinalEngine.Rendering/Loaders/Textures/Texture2DResourceLoader.cs b/FinalEngine.Rendering/Loaders/Textures/Texture2DResourceLoader.cs
@@ -52,15 +52,18 @@ public override ITexture2D LoadResource(string filePath)
 
                 for (int y = 0; y < image.Height; y++)
                 {
-                    var row = image.GetPixelRowSpan(y);
-
-                    for (int x = 0; x < image.Width; x++)
+                    image.ProcessPixelRows(processor =>
                     {
-                        pixels.Add(row[x].R);
-                        pixels.Add(row[x].G);
-                        pixels.Add(row[x].B);
-                        pixels.Add(row[x].A);
-                    }
+                        for (int x = 0; x < image.Width; x++)
+                        {
+                            var pixel = processor.GetRowSpan(y);
+
+                            pixels.Add(pixel[x].R);
+                            pixels.Add(pixel[x].G);
+                            pixels.Add(pixel[x].B);
+                            pixels.Add(pixel[x].A);
+                        }
+                    });
                 }
 
                 var rasterState = this.renderDevice.Rasterizer.GetRasterState();

diff --git a/FinalEngine.Tests/FinalEngine.Tests.csproj b/FinalEngine.Tests/FinalEngine.Tests.csproj
@@ -30,7 +30,7 @@
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
 		<PackageReference Include="OpenTK.Core" Version="4.8.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>