Mesa (master): glsl: add missing null check in tfeedback_decl::init()
Tapani Pälli
tpalli at kemper.freedesktop.org
Tue Sep 23 07:52:10 UTC 2014
Module: Mesa
Branch: master
Commit: 6e56eaf7b719b0635d605802b5b9e837b776291b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e56eaf7b719b0635d605802b5b9e837b776291b
Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date: Wed Feb 26 16:32:14 2014 +0200
glsl: add missing null check in tfeedback_decl::init()
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/glsl/link_varyings.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp
index 54ceae1..a738e2f 100644
--- a/src/glsl/link_varyings.cpp
+++ b/src/glsl/link_varyings.cpp
@@ -318,6 +318,11 @@ tfeedback_decl::init(struct gl_context *ctx, const void *mem_ctx,
const char *base_name_end;
long subscript = parse_program_resource_name(input, &base_name_end);
this->var_name = ralloc_strndup(mem_ctx, input, base_name_end - input);
+ if (this->var_name == NULL) {
+ _mesa_error_no_memory(__func__);
+ return;
+ }
+
if (subscript >= 0) {
this->array_subscript = subscript;
this->is_subscripted = true;
More information about the mesa-commit
mailing list