[Mesa-dev] [PATCH] glsl: fix cut-n-paste error in error handling. (v2)

[Matt Turner]

On Fri, Nov 30, 2012 at 12:34 AM, Dave Airlie <airlied at gmail.com> wrote:
> Reported by coverity scan.
>
> v2: fix second case
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/glsl/ir_validate.cpp | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
> index af0b576..ad57a31 100644
> --- a/src/glsl/ir_validate.cpp
> +++ b/src/glsl/ir_validate.cpp
> @@ -120,7 +120,7 @@ ir_visitor_status
>  ir_validate::visit_leave(ir_loop *ir)
>  {
>     if (ir->counter != NULL) {
> -      if ((ir->from == NULL) || (ir->from == NULL) || (ir->increment == NULL)) {
> +      if ((ir->from == NULL) || (ir->to == NULL) || (ir->increment == NULL)) {
>          printf("ir_loop has invalid loop controls:\n"
>                 "    counter:   %p\n"
>                 "    from:      %p\n"
> @@ -136,7 +136,7 @@ ir_validate::visit_leave(ir_loop *ir)
>          abort();
>        }
>     } else {
> -      if ((ir->from != NULL) || (ir->from != NULL) || (ir->increment != NULL)) {
> +      if ((ir->from != NULL) || (ir->to != NULL) || (ir->increment != NULL)) {
>          printf("ir_loop has invalid loop controls:\n"
>                 "    counter:   %p\n"
>                 "    from:      %p\n"
> --
> 1.7.11.7

Wow, nice. This code has been like this for more than two years now.

Reviewed-by: Matt Turner <mattst88 at gmail.com>