Mesa (master): draw: Fix segfault if rast is null

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Thu Feb 19 20:48:03 UTC 2009


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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Sat Feb 14 17:48:11 2009 +0100

draw: Fix segfault if rast is null

---

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

diff --git a/src/gallium/auxiliary/draw/draw_context.c b/src/gallium/auxiliary/draw/draw_context.c
index 7bd4a2e..581532c 100644
--- a/src/gallium/auxiliary/draw/draw_context.c
+++ b/src/gallium/auxiliary/draw/draw_context.c
@@ -138,8 +138,9 @@ void draw_set_driver_clipping( struct draw_context *draw,
    draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
 
    draw->driver.bypass_clipping = bypass_clipping;
-   draw->bypass_clipping = (draw->rasterizer->bypass_clipping || 
-                            draw->driver.bypass_clipping);
+   draw->bypass_clipping =
+      ((draw->rasterizer && draw->rasterizer->bypass_clipping) ||
+       draw->driver.bypass_clipping);
 }
 
 




More information about the mesa-commit mailing list