fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300: move pointer dereference after a NULL check

Browse source 
Vs state can be NULL by the time r300_set_constant_buffer is called.
We don't hit this with OpenGL though, so this is why I didn't spot
this in my testing, but nine hits this codepath. Restore the original
behavior here.

Fixes: 882811b1ff
Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15842>
This commit is contained in:
Pavel Ondračka 2022-04-10 18:57:56 +02:00 • committed by Marge Bot
parent 2149f12c1e
commit ef2b8f56b1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r300/r300_state.c
View file

@ -2087,7 +2087,7 @@ static void r300_set_constant_buffer(struct pipe_context *pipe,
if (shader == PIPE_SHADER_VERTEX) {
if (r300->screen->caps.has_tcl) {
struct r300_vertex_shader_code *vs = r300_vs(r300)->shader;
struct r300_vertex_shader *vs = r300_vs(r300);
if (!vs) {
cbuf->buffer_base = 0;
@ -2095,9 +2095,9 @@ static void r300_set_constant_buffer(struct pipe_context *pipe,
}
cbuf->buffer_base = r300->vs_const_base;
r300->vs_const_base += vs->code.constants.Count;
r300->vs_const_base += vs->shader->code.constants.Count;
if (r300->vs_const_base > R500_MAX_PVS_CONST_VECS) {
r300->vs_const_base = vs->code.constants.Count;
r300->vs_const_base = vs->shader->code.constants.Count;
cbuf->buffer_base = 0;
r300_mark_atom_dirty(r300, &r300->pvs_flush);
}