From b57c1e4b86a0884318418bb19191af41cfd40175 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 4 Aug 2013 01:18:28 -0700 Subject: [PATCH] llvmpipe: Do not need to free anything if there is no geometry shader. If gs is null, then freeing state->shader.tokens would result in a null dereference. Fixes "Dereference after null check" defect reported by Coverity. Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- src/gallium/drivers/llvmpipe/lp_state_gs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_state_gs.c b/src/gallium/drivers/llvmpipe/lp_state_gs.c index b18795cdc4f..55da0f16a8d 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_gs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_gs.c @@ -100,8 +100,11 @@ llvmpipe_delete_gs_state(struct pipe_context *pipe, void *gs) struct lp_geometry_shader *state = (struct lp_geometry_shader *)gs; - draw_delete_geometry_shader(llvmpipe->draw, - (state) ? state->draw_data : 0); + if (!state) { + return; + } + + draw_delete_geometry_shader(llvmpipe->draw, state->draw_data); FREE( (void *)state->shader.tokens ); FREE(state); } -- 2.30.2