mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-25 10:06:03 +00:00
60e16c15b6
* Fix memory corruption in FS Read methods when buffer is larger than needed * PR feedback * nit: Don't move this around
52 lines
1.6 KiB
C#
52 lines
1.6 KiB
C#
using LibHac;
|
|
using LibHac.Common;
|
|
using LibHac.Sf;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy
|
|
{
|
|
class IDirectory : DisposableIpcService
|
|
{
|
|
private SharedRef<LibHac.FsSrv.Sf.IDirectory> _baseDirectory;
|
|
|
|
public IDirectory(ref SharedRef<LibHac.FsSrv.Sf.IDirectory> directory)
|
|
{
|
|
_baseDirectory = SharedRef<LibHac.FsSrv.Sf.IDirectory>.CreateMove(ref directory);
|
|
}
|
|
|
|
[CommandHipc(0)]
|
|
// Read() -> (u64 count, buffer<nn::fssrv::sf::IDirectoryEntry, 6, 0> entries)
|
|
public ResultCode Read(ServiceCtx context)
|
|
{
|
|
ulong bufferAddress = context.Request.ReceiveBuff[0].Position;
|
|
ulong bufferLen = context.Request.ReceiveBuff[0].Size;
|
|
|
|
using (var region = context.Memory.GetWritableRegion(bufferAddress, (int)bufferLen, true))
|
|
{
|
|
Result result = _baseDirectory.Get.Read(out long entriesRead, new OutBuffer(region.Memory.Span));
|
|
|
|
context.ResponseData.Write(entriesRead);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
}
|
|
|
|
[CommandHipc(1)]
|
|
// GetEntryCount() -> u64
|
|
public ResultCode GetEntryCount(ServiceCtx context)
|
|
{
|
|
Result result = _baseDirectory.Get.GetEntryCount(out long entryCount);
|
|
|
|
context.ResponseData.Write(entryCount);
|
|
|
|
return (ResultCode)result.Value;
|
|
}
|
|
|
|
protected override void Dispose(bool isDisposing)
|
|
{
|
|
if (isDisposing)
|
|
{
|
|
_baseDirectory.Destroy();
|
|
}
|
|
}
|
|
}
|
|
}
|