citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

command_processor: Fix out-of-bounds float-uniform access (#7111) 

Addresses:
https://github.com/citra-emu/citra/issues/6696
https://github.com/citra-emu/citra/issues/6871
This commit is contained in:
Wunk 2023-11-03 03:35:52 -07:00 committed by GitHub
parent b5d744bcae
commit b10f3d96f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/command_processor.cpp
View File

@ -78,12 +78,11 @@ static void WriteUniformFloatReg(ShaderRegs& config, Shader::ShaderSetup& setup,
(float_regs_counter >= 3 && !uniform_setup.IsFloat32())) { (float_regs_counter >= 3 && !uniform_setup.IsFloat32())) {
float_regs_counter = 0; float_regs_counter = 0;
auto& uniform = setup.uniforms.f[uniform_setup.index]; if (uniform_setup.index >= setup.uniforms.f.size()) {
if (uniform_setup.index >= 96) {
LOG_ERROR(HW_GPU, "Invalid {} float uniform index {}", GetShaderSetupTypeName(setup), LOG_ERROR(HW_GPU, "Invalid {} float uniform index {}", GetShaderSetupTypeName(setup),
(int)uniform_setup.index); (int)uniform_setup.index);
} else { } else {
auto& uniform = setup.uniforms.f[uniform_setup.index];
// NOTE: The destination component order indeed is "backwards" // NOTE: The destination component order indeed is "backwards"
if (uniform_setup.IsFloat32()) { if (uniform_setup.IsFloat32()) {