From: Vinson Lee <vlee@freedesktop.org>
Date: Sun, 4 Aug 2013 08:18:28 +0000 (-0700)
Subject: llvmpipe: Do not need to free anything if there is no geometry shader.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b57c1e4b86a0884318418bb19191af41cfd40175;p=mesa.git

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 <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

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);
 }