Mesa (master): mesa/main: Check allocations success in _mesa_one_time_init_extension_overrides()
Tapani Pälli
tpalli at kemper.freedesktop.org
Tue Sep 23 07:52:10 UTC 2014
Module: Mesa
Branch: master
Commit: 51aa22148099f3c7e7e63b77523af629a535fa43
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=51aa22148099f3c7e7e63b77523af629a535fa43
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Wed Jul 2 20:50:42 2014 +0300
mesa/main: Check allocations success in _mesa_one_time_init_extension_overrides()
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/mesa/main/extensions.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 553c01e..43f0e8d 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -609,6 +609,15 @@ _mesa_one_time_init_extension_overrides(void)
/* Copy env_const because strtok() is destructive. */
env = strdup(env_const);
+
+ if (env == NULL || extra_extensions == NULL ||
+ cant_disable_extensions == NULL) {
+ free(env);
+ free(extra_extensions);
+ free(cant_disable_extensions);
+ return;
+ }
+
for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {
int enable;
bool recognized;
More information about the mesa-commit
mailing list