Mesa (master): r300: Add asserts to check for null pointer dereferences.

Vinson Lee vlee at kemper.freedesktop.org
Sat Feb 27 23:36:53 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Feb 27 15:36:11 2010 -0800

r300: Add asserts to check for null pointer dereferences.

---

 src/mesa/drivers/dri/r300/r300_vertprog.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 6a366b4..cbe4cb8 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -79,6 +79,7 @@ static int r300VertexProgUpdateParams(GLcontext * ctx, struct r300_vertex_progra
 			break;
 		}
 
+		assert(src);
 		dst[4*i] = src[0];
 		dst[4*i + 1] = src[1];
 		dst[4*i + 2] = src[2];
@@ -311,6 +312,7 @@ struct r300_vertex_program * r300SelectAndTranslateVertexShader(GLcontext *ctx)
 		r300SelectAndTranslateFragmentShader(ctx);
 	}
 
+	assert(r300->selected_fp);
 	wanted_key.FpReads = r300->selected_fp->InputsRead;
 	wanted_key.FogAttr = r300->selected_fp->fog_attr;
 	wanted_key.WPosAttr = r300->selected_fp->wpos_attr;




More information about the mesa-commit mailing list