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

Author: Brian Paul <[email protected]>
Date:   Thu Mar  5 10:01:17 2009 -0700

gallium: added null ptr check in align_free()

---

 src/gallium/auxiliary/util/u_memory.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_memory.h 
b/src/gallium/auxiliary/util/u_memory.h
index ceb3a1c..0b18d04 100644
--- a/src/gallium/auxiliary/util/u_memory.h
+++ b/src/gallium/auxiliary/util/u_memory.h
@@ -191,9 +191,11 @@ align_free(void *ptr)
 #if defined(HAVE_POSIX_MEMALIGN)
    FREE(ptr);
 #else
-   void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));
-   void *realAddr = *cubbyHole;
-   FREE(realAddr);
+   if (ptr) {
+      void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));
+      void *realAddr = *cubbyHole;
+      FREE(realAddr);
+   }
 #endif /* defined(HAVE_POSIX_MEMALIGN) */
 }
 

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to