Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Misc. asan fixes #13439

Merged
merged 5 commits into from Feb 26, 2023
Merged

Misc. asan fixes #13439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11f6b9b
fix use after move in cellVdec.cpp
oltolm Jan 22, 2023
a1b9d9d
fix: back() called an empty string in PPUThread.cpp
oltolm Jan 22, 2023
aa7ea8c
fix out-of-bounds in VKGSRenderTypes.hpp
oltolm Jan 22, 2023
b984cb1
cellVdec.cpp: use lock_unlock instead of lock_guard
oltolm Feb 23, 2023
cfd8441
Merge branch 'master' into misc_asan_fixes
Megamouse Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/Modules/cellVdec.cpp
View file
Open in desktop
Expand Up @@ -980,8 +980,8 @@ error_code cellVdecClose(ppu_thread& ppu, u32 handle)
ppu_execute<&sys_interrupt_thread_disestablish>(ppu, tid);
}

std::lock_guard lock{vdec->mutex};
vdec->seq_state = sequence_state::closed;
vdec->mutex.lock_unlock();

if (!idm::remove_verify<vdec_context>(handle, std::move(vdec)))
{
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/PPUThread.cpp
View file
Open in desktop
Expand Up @@ -3275,7 +3275,7 @@ extern void ppu_initialize()

const std::string mount_point = vfs::get("/dev_flash/");

bool dev_flash_located = Emu.GetCat().back() != 'P' && Emu.IsPathInsideDir(Emu.GetBoot(), mount_point);
bool dev_flash_located = !Emu.GetCat().ends_with('P') && Emu.IsPathInsideDir(Emu.GetBoot(), mount_point);

if (compile_fw || dev_flash_located)
{
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/VK/VKGSRenderTypes.hpp
View file
Open in desktop
Expand Up @@ -364,7 +364,7 @@ namespace vk

inline command_buffer_chunk* get()
{
return &m_cb_list[m_current_index];
return &m_cb_list[m_current_index % Count];
}
};
}