diff options
| author | Mary <me@thog.eu> | 2021-11-01 23:38:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 19:38:13 -0300 |
| commit | f41687f4c1948e9e111afd70e979e98ea5de52fa (patch) | |
| tree | e7e34e4f8a986c7165cb3eb2fb3e216329d1c04d /Ryujinx.HLE/HOS/Applets/Error | |
| parent | e48530e9d9f0bbaeb8fa5978d1a66c99e6fecbac (diff) | |
hle: Make Ryujinx.HLE project entirely safe (#2789)
* Remove a bit of unsafety around
* Regenerate StructArrayHelpers with a max element value of 256
* hle: remove unsafe marker from all struct that had it
* hle: make SoftwareKeyboardRenderer.TryCopyTo safe
* hle: remove unsafety in NpadDevice and remove AllowUnsafeBlocks from csproj
* Revert "Regenerate StructArrayHelpers with a max element value of 256"
This reverts commit f32a6e5be094f50571970eb1116b65c080781d05.
* Introduce ByteArray of various size and use that instead of ArrayXXX to avoid stackoverflow in .NET runtime type resolution
* Use ByteArray more
* Add some missing spaces on Pack = 1 for various structs
* Fix broken logic for TryCopyTo
* Address gdkchan's comment
* Address gdkchan's comment
Diffstat (limited to 'Ryujinx.HLE/HOS/Applets/Error')
| -rw-r--r-- | Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs | 14 | ||||
| -rw-r--r-- | Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs index 931c5912..2763253b 100644 --- a/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs +++ b/Ryujinx.HLE/HOS/Applets/Error/ApplicationErrorArg.cs @@ -1,13 +1,15 @@ -using System.Runtime.InteropServices; +using Ryujinx.Common.Memory; +using System; +using System.Runtime.InteropServices; namespace Ryujinx.HLE.HOS.Applets.Error { [StructLayout(LayoutKind.Sequential, Pack = 1)] - unsafe struct ApplicationErrorArg + struct ApplicationErrorArg { - public uint ErrorNumber; - public ulong LanguageCode; - public fixed byte MessageText[0x800]; - public fixed byte DetailsText[0x800]; + public uint ErrorNumber; + public ulong LanguageCode; + public ByteArray2048 MessageText; + public ByteArray2048 DetailsText; } }
\ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs b/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs index 84562176..1b009de7 100644 --- a/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs +++ b/Ryujinx.HLE/HOS/Applets/Error/ErrorApplet.cs @@ -34,8 +34,7 @@ namespace Ryujinx.HLE.HOS.Applets.Error _horizon = horizon; } - public ResultCode Start(AppletSession normalSession, - AppletSession interactiveSession) + public ResultCode Start(AppletSession normalSession, AppletSession interactiveSession) { _normalSession = normalSession; _commonArguments = IApplet.ReadStruct<CommonArguments>(_normalSession.Pop()); @@ -176,11 +175,9 @@ namespace Ryujinx.HLE.HOS.Applets.Error byte[] messageTextBuffer = new byte[0x800]; byte[] detailsTextBuffer = new byte[0x800]; - unsafe - { - Marshal.Copy((IntPtr)applicationErrorArg.MessageText, messageTextBuffer, 0, 0x800); - Marshal.Copy((IntPtr)applicationErrorArg.DetailsText, detailsTextBuffer, 0, 0x800); - } + + applicationErrorArg.MessageText.ToSpan().CopyTo(messageTextBuffer); + applicationErrorArg.DetailsText.ToSpan().CopyTo(detailsTextBuffer); string messageText = Encoding.ASCII.GetString(messageTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray()); string detailsText = Encoding.ASCII.GetString(detailsTextBuffer.TakeWhile(b => !b.Equals(0)).ToArray()); |