Mesa (master): radeonsi: add malloc fail paths to si_create_shader_state
Marek Olšák
mareko at kemper.freedesktop.org
Thu Sep 24 17:51:29 UTC 2015
Module: Mesa
Branch: master
Commit: 9a2e8a94b1609a440f2a6184663335664097db75
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a2e8a94b1609a440f2a6184663335664097db75
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Sep 10 18:16:26 2015 +0200
radeonsi: add malloc fail paths to si_create_shader_state
Cc: 11.0 <mesa-stable at lists.freedesktop.org>
Acked-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
---
src/gallium/drivers/radeonsi/si_state_shaders.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index db45cc1..1f1965f 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -666,8 +666,16 @@ static void *si_create_shader_state(struct pipe_context *ctx,
struct si_shader_selector *sel = CALLOC_STRUCT(si_shader_selector);
int i;
+ if (!sel)
+ return NULL;
+
sel->type = pipe_shader_type;
sel->tokens = tgsi_dup_tokens(state->tokens);
+ if (!sel->tokens) {
+ FREE(sel);
+ return NULL;
+ }
+
sel->so = state->stream_output;
tgsi_scan_shader(state->tokens, &sel->info);
p_atomic_inc(&sscreen->b.num_shaders_created);
More information about the mesa-commit
mailing list