Mesa (master): mesa: Add missing null checks into prog_hash_table.c
Tapani Pälli
tpalli at kemper.freedesktop.org
Fri May 30 06:23:43 UTC 2014
Module: Mesa
Branch: master
Commit: fb7baafbbf6d4e5d418d93a1a2cd222c3ae3aae6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb7baafbbf6d4e5d418d93a1a2cd222c3ae3aae6
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Thu Feb 13 16:04:23 2014 +0200
mesa: Add missing null checks into prog_hash_table.c
Check calloc return values in hash_table_insert() and
hash_table_replace()
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/program/prog_hash_table.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/mesa/program/prog_hash_table.c b/src/mesa/program/prog_hash_table.c
index f45ed46..2445d84 100644
--- a/src/mesa/program/prog_hash_table.c
+++ b/src/mesa/program/prog_hash_table.c
@@ -142,6 +142,10 @@ hash_table_insert(struct hash_table *ht, void *data, const void *key)
struct hash_node *node;
node = calloc(1, sizeof(*node));
+ if (node == NULL) {
+ _mesa_error_no_memory(__func__);
+ return;
+ }
node->data = data;
node->key = key;
@@ -167,6 +171,10 @@ hash_table_replace(struct hash_table *ht, void *data, const void *key)
}
hn = calloc(1, sizeof(*hn));
+ if (hn == NULL) {
+ _mesa_error_no_memory(__func__);
+ return false;
+ }
hn->data = data;
hn->key = key;
More information about the mesa-commit
mailing list