From 37cfc51b13712fad8e97c12f59efa2b3fb9fdae2 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 1 Mar 2016 14:45:00 -0700 Subject: [PATCH] st/mesa: move dereference after null check We should not dereference shader before we have done the null check. Reviewed-by: Erik Faye-Lund Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_atom_image.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_atom_image.c b/src/mesa/state_tracker/st_atom_image.c index 4b48bc30b69..d0f0c42a3b3 100644 --- a/src/mesa/state_tracker/st_atom_image.c +++ b/src/mesa/state_tracker/st_atom_image.c @@ -48,11 +48,13 @@ st_bind_images(struct st_context *st, struct gl_shader *shader, { unsigned i; struct pipe_image_view images[MAX_IMAGE_UNIFORMS]; - struct gl_program_constants *c = &st->ctx->Const.Program[shader->Stage]; + struct gl_program_constants *c; if (!shader || !st->pipe->set_shader_images) return; + c = &st->ctx->Const.Program[shader->Stage]; + for (i = 0; i < shader->NumImages; i++) { struct gl_image_unit *u = &st->ctx->ImageUnits[shader->ImageUnits[i]]; struct st_texture_object *stObj = st_texture_object(u->TexObj); -- 2.30.2