Mesa (master): mesa: add missing null check in _mesa_NewHashTable()
Tapani Pälli
tpalli at kemper.freedesktop.org
Fri May 30 04:24:01 UTC 2014
Module: Mesa
Branch: master
Commit: 77a00c71bb3ecaafc9ceec035937c02e75a505b6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77a00c71bb3ecaafc9ceec035937c02e75a505b6
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Wed Feb 26 14:03:19 2014 +0200
mesa: add missing null check in _mesa_NewHashTable()
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.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 23018e9..674c29d 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(__func__);
+ 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(__func__);
+ }
+
return table;
}
More information about the mesa-commit
mailing list