mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-16 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys_fs: Fix sys_fs_read/write when nbytes is 0

Browse Source
This commit is contained in:
Eladash 2021-09-21 12:07:01 +03:00 committed by Ivan
parent 4237039d53
commit 3e06446297
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View File

@ -637,12 +637,25 @@ error_code sys_fs_read(ppu_thread& ppu, u32 fd, vm::ptr<void> buf, u64 nbytes, v
const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
if (!file || file->flags & CELL_FS_O_WRONLY)
if (!file || (nbytes && file->flags & CELL_FS_O_WRONLY))
{
nread.try_write(0); // nread writing is allowed to fail, error code is unchanged
return CELL_EBADF;
}
if (!nbytes)
{
// Whole function is skipped, only EBADF and EBUSY are checked
if (file->lock == 1)
{
nread.try_write(0);
return CELL_EBUSY;
}
*nread = 0;
return CELL_OK;
}
std::lock_guard lock(file->mp->mutex);
if (!file->file)
@ -681,12 +694,25 @@ error_code sys_fs_write(ppu_thread& ppu, u32 fd, vm::cptr<void> buf, u64 nbytes,
const auto file = idm::get<lv2_fs_object, lv2_file>(fd);
if (!file || !(file->flags & CELL_FS_O_ACCMODE))
if (!file || (nbytes && !(file->flags & CELL_FS_O_ACCMODE)))
{
nwrite.try_write(0); // nwrite writing is allowed to fail, error code is unchanged
return CELL_EBADF;
}
if (!nbytes)
{
// Whole function is skipped, only EBADF and EBUSY are checked
if (file->lock == 1)
{
nwrite.try_write(0);
return CELL_EBUSY;
}
*nwrite = 0;
return CELL_OK;
}
if (file->mp->flags & lv2_mp_flag::read_only)
{
nwrite.try_write(0);