Perform bounds checking before list indexer to avoid frequent exceptions (#4438 )

* Perform bounds checking before list indexer to avoid frequent ArgumentOutOfRangeExceptions * do a single compare after casting id and .Count to uint
Account for multisample when calculating render target size hint (#4467 )
2023-02-25 10:26:39 +00:00 · 2023-02-23 10:08:54 +01:00 · 2023-02-22 17:58:32 -03:00 · 2023-02-22 16:08:25 +01:00 · 2023-02-22 13:30:53 +01:00 · 2023-02-22 09:13:50 +01:00
5 changed files with 21 additions and 8 deletions
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -22,7 +22,7 @@
    <PackageVersion Include="LibHac" Version="0.17.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
    <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
    <PackageVersion Include="NUnit" Version="3.13.3" />
    <PackageVersion Include="NUnit3TestAdapter" Version="4.1.0" />
@ -49,7 +49,7 @@
    <PackageVersion Include="System.Management" Version="7.0.0" />
    <PackageVersion Include="System.Net.NameResolution" Version="4.3.0" />
    <PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0" />
-    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-9c9356d" />
+    <PackageVersion Include="UnicornEngine.Unicorn" Version="2.0.2-rc1-a913199" />
    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.5.1" />
  </ItemGroup>
 </Project>
--- a/Ryujinx.Ava/Modules/Updater/Updater.cs
+++ b/Ryujinx.Ava/Modules/Updater/Updater.cs
@ -506,6 +506,11 @@ namespace Ryujinx.Modules

                            Dispatcher.UIThread.Post(() =>
                            {
+                                if (tarEntry is null)
+                                {
+                                    return;
+                                }
+
                                taskDialog.SetProgressBarState(GetPercentage(tarEntry.Size, inStream.Length), TaskDialogProgressState.Normal);
                            });
                        }
--- a/Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs
+++ b/Ryujinx.Ava/UI/ViewModels/TitleUpdateViewModel.cs
@ -105,13 +105,13 @@ public class TitleUpdateViewModel : BaseModel
            AddUpdate(path);
        }

-        // NOTE: Save the list again to remove leftovers.
-        Save();
-
        TitleUpdateModel selected = TitleUpdates.FirstOrDefault(x => x.Path == _titleUpdateWindowData.Selected, null);

        SelectedUpdate = selected;

+        // NOTE: Save the list again to remove leftovers.
+        Save();
+
        SortUpdates();
    }

--- a/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
+++ b/Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs
@ -439,7 +439,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
            int samplesInY = msaaMode.SamplesInY();

            var scissor = _state.State.ScreenScissorState;
-            Size sizeHint = new Size(scissor.X + scissor.Width, scissor.Y + scissor.Height, 1);
+            Size sizeHint = new Size((scissor.X + scissor.Width) * samplesInX, (scissor.Y + scissor.Height) * samplesInY, 1);

            int clipRegionWidth = int.MaxValue;
            int clipRegionHeight = int.MaxValue;
--- a/Ryujinx.Graphics.Vulkan/IdList.cs
+++ b/Ryujinx.Graphics.Vulkan/IdList.cs
@ -80,8 +80,16 @@ namespace Ryujinx.Graphics.Vulkan

            try
            {
-                value = _list[id];
-                return value != null;
+                if ((uint)id < (uint)_list.Count)
+                {
+                    value = _list[id];
+                    return value != null;
+                }
+                else
+                {
+                    value = null;
+                    return false;
+                }
            }
            catch (ArgumentOutOfRangeException)
            {
Author	SHA1	Message	Date
jhorv	58207685c0	Perform bounds checking before list indexer to avoid frequent exceptions (#4438 ) * Perform bounds checking before list indexer to avoid frequent ArgumentOutOfRangeExceptions * do a single compare after casting id and .Count to uint	2023-02-25 10:26:39 +00:00
gdkchan	095ad923ad	Account for multisample when calculating render target size hint (#4467 )	2023-02-23 10:08:54 +01:00
Isaac Marovitz	f07ae7d53f	Fix Title Update Manager not selecting right update (#4452 )	2023-02-22 17:58:32 -03:00
dependabot[bot]	c308f09722	nuget: bump Microsoft.NET.Test.Sdk from 17.4.1 to 17.5.0 (#4458 ) Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 17.4.1 to 17.5.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Changelog](https://github.com/microsoft/vstest/blob/main/docs/releases.md) - [Commits](https://github.com/microsoft/vstest/compare/v17.4.1...v17.5.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-02-22 16:08:25 +01:00
dependabot[bot]	f1eef29409	nuget: bump UnicornEngine.Unicorn (#4459 ) Bumps [UnicornEngine.Unicorn](https://github.com/unicorn-engine/unicorn) from 2.0.2-rc1-9c9356d to 2.0.2-rc1-a913199. - [Release notes](https://github.com/unicorn-engine/unicorn/releases) - [Changelog](https://github.com/unicorn-engine/unicorn/blob/master/ChangeLog) - [Commits](https://github.com/unicorn-engine/unicorn/commits) --- updated-dependencies: - dependency-name: UnicornEngine.Unicorn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-02-22 13:30:53 +01:00
TSRBerry	1f8d66db7c	Ava: Fix Updater crashing on Linux (#4457 )	2023-02-22 09:13:50 +01:00