[Mesa-dev] [PATCH 07/11] mesa: add missing null check in _mesa_NewHashTable()
Juha-Pekka Heikkila
juhapekka.heikkila at gmail.com
Fri Apr 4 03:28:01 PDT 2014
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
src/mesa/main/hash.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index 4c92005..21da652 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -115,10 +115,20 @@ _mesa_NewHashTable(void)
if (table) {
table->ht = _mesa_hash_table_create(NULL, uint_key_compare);
+ if (table->ht == NULL) {
+ FREE(table);
+ _mesa_error_no_memory(__FUNCTION__);
+ return NULL;
+ }
+
_mesa_hash_table_set_deleted_key(table->ht, uint_key(DELETED_KEY_VALUE));
mtx_init(&table->Mutex, mtx_plain);
mtx_init(&table->WalkMutex, mtx_plain);
}
+ else {
+ _mesa_error_no_memory(__FUNCTION__);
+ }
+
return table;
}
--
1.8.1.2
More information about the mesa-dev
mailing list