RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 06:26:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

sceNp/vm: Fix strings read, implement safe string reader

Browse source
This commit is contained in:
Eladash 2023-12-11 08:45:38 +02:00 • committed by Elad Ashkenazi
parent 8ebb7b4952
commit 60baa49007
6 changed files with 113 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/Cell/lv2/sys_ppu_thread.cpp
View file

@ -522,9 +522,13 @@ error_code _sys_ppu_thread_create(ppu_thread& ppu, vm::ptr<u64> thread_id, vm::p
if (threadname)
{
constexpr u32 max_size = c_max_ppu_name_size; // max size including null terminator
const auto pname = threadname.get_ptr();
ppu_name.assign(pname, std::find(pname, pname + max_size, '\0'));
constexpr u32 max_size = c_max_ppu_name_size - 1; // max size excluding null terminator
if (!vm::read_string(threadname.addr(), max_size, ppu_name, true))
{
dct.free(stack_size);
return CELL_EFAULT;
}
}
const u32 tid = idm::import<named_thread<ppu_thread>>([&]()
@ -614,11 +618,16 @@ error_code sys_ppu_thread_rename(ppu_thread& ppu, u32 thread_id, vm::cptr<char>
return CELL_EFAULT;
}
constexpr u32 max_size = c_max_ppu_name_size; // max size including null terminator
const auto pname = name.get_ptr();
constexpr u32 max_size = c_max_ppu_name_size - 1; // max size excluding null terminator
// Make valid name
auto _name = make_single<std::string>(pname, std::find(pname, pname + max_size, '\0'));
std::string out_str;
if (!vm::read_string(name.addr(), max_size, out_str, true))
{
return CELL_EFAULT;
}
auto _name = make_single<std::string>(std::move(out_str));
// thread_ctrl name is not changed (TODO)
sys_ppu_thread.warning(u8"sys_ppu_thread_rename(): Thread renamed to “%s”", *_name);