The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-23 09:31:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup IStorageAccessor validation code

Browse Source
This commit is contained in:
Billy Laws 2021-09-17 19:45:47 +01:00
parent 83eb88d78b
commit 4a7700bd7c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/cpp/skyline/services/am/storage/IStorageAccessor.cpp
View File

@ -14,11 +14,12 @@ namespace skyline::service::am {
Result IStorageAccessor::Write(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) { Result IStorageAccessor::Write(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
auto offset{request.Pop<i64>()}; auto offset{request.Pop<i64>()};
auto size{std::min(static_cast<i64>(request.inputBuf.at(0).size()), static_cast<i64>(parent->content.size()) - offset)};
if (offset > parent->content.size()) if (offset < 0 || offset > parent->content.size())
return result::OutOfBounds; return result::OutOfBounds;
auto size{std::min(static_cast<i64>(request.inputBuf.at(0).size()), static_cast<i64>(parent->content.size()) - offset)};
if (size) if (size)
span(parent->content).copy_from(request.inputBuf.at(0), size); span(parent->content).copy_from(request.inputBuf.at(0), size);
@ -27,12 +28,13 @@ namespace skyline::service::am {
Result IStorageAccessor::Read(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) { Result IStorageAccessor::Read(type::KSession &session, ipc::IpcRequest &request, ipc::IpcResponse &response) {
auto offset{request.Pop<i64>()}; auto offset{request.Pop<i64>()};
auto size{std::min(static_cast<i64>(request.outputBuf.at(0).size()), static_cast<i64>(parent->content.size()) - offset)};
if (offset > parent->content.size()) if (offset < 0 || offset > parent->content.size())
return result::OutOfBounds; return result::OutOfBounds;
if (size > 0) auto size{std::min(static_cast<i64>(request.outputBuf.at(0).size()), static_cast<i64>(parent->content.size()) - offset)};
if (size)
request.outputBuf.at(0).copy_from(span(parent->content.data() + offset, size)); request.outputBuf.at(0).copy_from(span(parent->content.data() + offset, size));
return {}; return {};