Mesa (master): draw: Add a null check for draw.

Vinson Lee vlee at kemper.freedesktop.org
Tue Oct 1 04:51:20 UTC 2013


Module: Mesa
Branch: master
Commit: 505a6de7fc5e281d0faf7950cc97fbe88cd9bbf4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=505a6de7fc5e281d0faf7950cc97fbe88cd9bbf4

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Fri Sep 27 21:46:33 2013 -0700

draw: Add a null check for draw.

There is an earlier null check for draw so draw could be null here as
well.

Fixes "Dereference after null check" defect reported by Coverity.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/auxiliary/draw/draw_pipe_unfilled.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/auxiliary/draw/draw_pipe_unfilled.c b/src/gallium/auxiliary/draw/draw_pipe_unfilled.c
index 7a88ce0..8cba07c 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_unfilled.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_unfilled.c
@@ -237,7 +237,7 @@ draw_unfilled_prepare_outputs( struct draw_context *draw,
    boolean is_unfilled = (rast &&
                           (rast->fill_front != PIPE_POLYGON_MODE_FILL ||
                            rast->fill_back != PIPE_POLYGON_MODE_FILL));
-   const struct draw_fragment_shader *fs = draw->fs.fragment_shader;
+   const struct draw_fragment_shader *fs = draw ? draw->fs.fragment_shader : 0;
 
    if (is_unfilled && fs && fs->info.uses_frontface)  {
       unfilled->face_slot = draw_alloc_extra_vertex_attrib(




More information about the mesa-commit mailing list