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

Vinson Lee vlee at kemper.freedesktop.org
Sun Feb 28 00:38:38 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Feb 27 16:38:09 2010 -0800

mach64: Add asserts to check for null pointer dereferences.

---

 src/mesa/drivers/dri/mach64/mach64_texmem.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/mesa/drivers/dri/mach64/mach64_texmem.c b/src/mesa/drivers/dri/mach64/mach64_texmem.c
index 46cee43..b09954c 100644
--- a/src/mesa/drivers/dri/mach64/mach64_texmem.c
+++ b/src/mesa/drivers/dri/mach64/mach64_texmem.c
@@ -305,6 +305,7 @@ void mach64UploadTexImages( mach64ContextPtr mmesa, mach64TexObjPtr t )
       t->heap = heap;
 
       /* Set the base offset of the texture image */
+      assert(t->base.memBlock);
       t->bufAddr = mmesa->mach64Screen->texOffset[heap] + t->base.memBlock->ofs;
 
       /* Force loading the new state into the hardware */
@@ -457,7 +458,9 @@ void mach64UploadMultiTexImages( mach64ContextPtr mmesa,
       }
 
       /* Set the base offset of the texture image */
+      assert(t0->base.memBlock);
       t0->bufAddr = mmesa->mach64Screen->texOffset[heap] + t0->base.memBlock->ofs;
+      assert(t1->base.memBlock);
       t1->bufAddr = mmesa->mach64Screen->texOffset[heap] + t1->base.memBlock->ofs;
 
       /* Force loading the new state into the hardware */




More information about the mesa-commit mailing list