Mesa (master): mesa: Test for failed malloc in _mesa_HashInsert.

Brian Paul brianp at kemper.freedesktop.org
Tue Feb 16 15:22:05 UTC 2010


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Feb 16 08:21:28 2010 -0700

mesa: Test for failed malloc in _mesa_HashInsert.

Signed-off-by: Brian Paul <brianp at vmware.com>

(cherry picked from commit 7c7247ddbf6e3f7f93e44c1cb52490044f1a2215)

---

 src/mesa/main/hash.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 08c6456..7c3c7a6 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -191,10 +191,12 @@ _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data)
 
    /* alloc and insert new table entry */
    entry = MALLOC_STRUCT(HashEntry);
-   entry->Key = key;
-   entry->Data = data;
-   entry->Next = table->Table[pos];
-   table->Table[pos] = entry;
+   if (entry) {
+      entry->Key = key;
+      entry->Data = data;
+      entry->Next = table->Table[pos];
+      table->Table[pos] = entry;
+   }
 
    _glthread_UNLOCK_MUTEX(table->Mutex);
 }




More information about the mesa-commit mailing list