diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2022-10-04 20:12:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-04 20:12:54 -0300 |
| commit | 60e16c15b6e9351371711356d205a12435b3c574 (patch) | |
| tree | cbfa8d94a83752419defba6ca2a953d558e5c236 /Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs | |
| parent | 2068445939e1b39f3e07f64aa11b93491d1116a7 (diff) | |
Fix memory corruption in BCAT and FS Read methods when buffer is larger than needed (#3739)1.1.294
* Fix memory corruption in FS Read methods when buffer is larger than needed
* PR feedback
* nit: Don't move this around
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs b/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs index bb664e55..0bb4123f 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs @@ -17,17 +17,17 @@ namespace Ryujinx.HLE.HOS.Services.Fs // ReadSaveDataInfo() -> (u64, buffer<unknown, 6>) public ResultCode ReadSaveDataInfo(ServiceCtx context) { - ulong bufferPosition = context.Request.ReceiveBuff[0].Position; + ulong bufferAddress = context.Request.ReceiveBuff[0].Position; ulong bufferLen = context.Request.ReceiveBuff[0].Size; - byte[] infoBuffer = new byte[bufferLen]; - - Result result = _baseReader.Get.Read(out long readCount, new OutBuffer(infoBuffer)); + using (var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true)) + { + Result result = _baseReader.Get.Read(out long readCount, new OutBuffer(region.Memory.Span)); - context.Memory.Write(bufferPosition, infoBuffer); - context.ResponseData.Write(readCount); + context.ResponseData.Write(readCount); - return (ResultCode)result.Value; + return (ResultCode)result.Value; + } } protected override void Dispose(bool isDisposing) |