Mesa (master): pipebuffer: handle possible null pointer dereference

Zack Rusin zack at kemper.freedesktop.org
Tue Jul 7 01:40:12 UTC 2009


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

Author: Zack Rusin <zack at kde.org>
Date:   Sat Jun 20 21:36:40 2009 -0400

pipebuffer: handle possible null pointer dereference

reported by clang static analyzer

---

 .../auxiliary/pipebuffer/pb_buffer_malloc.c        |    2 ++
 .../auxiliary/pipebuffer/pb_bufmgr_ondemand.c      |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
index 0760d60..6bdce5f 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_buffer_malloc.c
@@ -53,6 +53,8 @@ static INLINE struct malloc_buffer *
 malloc_buffer(struct pb_buffer *buf)
 {
    assert(buf);
+   if (!buf)
+      return NULL;
    assert(buf->vtbl == &malloc_buffer_vtbl);
    return (struct malloc_buffer *)buf;
 }
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c
index bc3093f..cb32d25 100644
--- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c
+++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_ondemand.c
@@ -74,6 +74,8 @@ static INLINE struct pb_ondemand_buffer *
 pb_ondemand_buffer(struct pb_buffer *buf)
 {
    assert(buf);
+   if (!buf)
+      return NULL;
    assert(buf->vtbl == &pb_ondemand_buffer_vtbl);
    return (struct pb_ondemand_buffer *)buf;
 }




More information about the mesa-commit mailing list