Attachment 107763 Details for Bug 82920 – fix for valgrind warnings

[patch] fix for valgrind warnings

0001-glsl-guard-access-to-var-after-get_variable_being_re.patch (text/plain), 1.87 KB, created by Tapani Pälli on 2014-10-13 08:11:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tapani Pälli

Created: 2014-10-13 08:11:34 UTC

Size: 1.87 KB

patch

obsolete

>From f27535fb953625258bd9ed014f8b7786af4ad12c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
>Date: Mon, 13 Oct 2014 11:06:54 +0300
>Subject: [PATCH] glsl: guard access to var after get_variable_being_redeclared
> call
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>get_variable_being_redeclared can delete current processed variable if
>eariler declaration found, var should not be accessed if earlier
>declaration was returned.
>
>Signed-off-by: Tapani PÃ¤lli <tapani.palli@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82920
>---
> src/glsl/ast_to_hir.cpp | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
>index 068af29..5080dcf 100644
>--- a/src/glsl/ast_to_hir.cpp
>+++ b/src/glsl/ast_to_hir.cpp
>@@ -5685,13 +5685,13 @@ ast_interface_block::hir(exec_list *instructions,
>             ir_variable *earlier =
>                get_variable_being_redeclared(var, loc, state,
>                                              true /* allow_all_redeclarations */);
>-            if (!is_gl_identifier(var->name) || earlier == NULL) {
>+            if ((!earlier && !is_gl_identifier(var->name)) || earlier == NULL) {
>                _mesa_glsl_error(&loc, state,
>                                 "redeclaration of gl_PerVertex can only "
>                                 "include built-in variables");
>             } else if (earlier->data.how_declared == ir_var_declared_normally) {
>                _mesa_glsl_error(&loc, state,
>-                                "`%s' has already been redeclared", var->name);
>+                                "`%s' has already been redeclared", earlier->name);
>             } else {
>                earlier->data.how_declared = ir_var_declared_in_block;
>                earlier->reinit_interface_type(block_type);
>-- 
>1.9.3
>

Actions: View | Splinter Review

Attachments on bug 82920: 105060 | 105095 | 107763 | 112476 | 112477

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.