archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

sys_fs: avoid possible out of memory on file reads/writes

Browse source 
Use fixed-sized intermediate buffer.
This commit is contained in:
Nekotekina 2020-01-19 04:25:50 +03:00
parent 63f67c88cc
commit 3617f12a1e
1 changed files with 36 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

42
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View file

@ -89,18 +89,48 @@ lv2_fs_mount_point* lv2_fs_object::get_mp(std::string_view filename)
u64 lv2_file::op_read(vm::ptr<void> buf, u64 size) u64 lv2_file::op_read(vm::ptr<void> buf, u64 size)
{ {
// Copy data from intermediate buffer (avoid passing vm pointer to a native API) // Copy data from intermediate buffer (avoid passing vm pointer to a native API)
std::unique_ptr<u8[]> local_buf(new u8[size]); uchar local_buf[65536];
const u64 result = file.read(local_buf.get(), size);
std::memcpy(buf.get_ptr(), local_buf.get(), result); u64 result = 0;
while (result < size)
{
const u64 block = std::min<u64>(size - result, sizeof(local_buf));
const u64 nread = file.read(+local_buf, block);
std::memcpy(static_cast<uchar*>(buf.get_ptr()) + result, local_buf, nread);
result += nread;
if (nread < block)
{
break;
}
}
return result; return result;
} }
u64 lv2_file::op_write(vm::cptr<void> buf, u64 size) u64 lv2_file::op_write(vm::cptr<void> buf, u64 size)
{ {
// Copy data to intermediate buffer (avoid passing vm pointer to a native API) // Copy data to intermediate buffer (avoid passing vm pointer to a native API)
std::unique_ptr<u8[]> local_buf(new u8[size]); uchar local_buf[65536];
std::memcpy(local_buf.get(), buf.get_ptr(), size);
return file.write(local_buf.get(), size); u64 result = 0;
while (result < size)
{
const u64 block = std::min<u64>(size - result, sizeof(local_buf));
std::memcpy(local_buf, static_cast<const uchar*>(buf.get_ptr()), block);
const u64 nwrite = file.write(+local_buf, block);
result += nwrite;
if (nwrite < block)
{
break;
}
}
return result;
} }
struct lv2_file::file_view : fs::file_base struct lv2_file::file_view : fs::file_base