From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 30 Aug 2010 12:48:21 +0000 (+0100)
Subject: mesa: Fix _mesa_lookup_parameter_constant's return value.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=128237927d6fa4ffb23e52c59150f57520004c00;p=mesa.git

mesa: Fix _mesa_lookup_parameter_constant's return value.

Fixes gcc warning

  In function ‘_mesa_add_unnamed_constant’:
  warning: ‘pos’ may be used uninitialized in this function

but also what appears to be a bug.
---

diff --git a/src/mesa/program/prog_parameter.c b/src/mesa/program/prog_parameter.c
index 40dc92cb201..6bf8a081b02 100644
--- a/src/mesa/program/prog_parameter.c
+++ b/src/mesa/program/prog_parameter.c
@@ -482,8 +482,10 @@ _mesa_lookup_parameter_constant(const struct gl_program_parameter_list *list,
    assert(vSize >= 1);
    assert(vSize <= 4);
 
-   if (!list)
-      return -1;
+   if (!list) {
+      *posOut = -1;
+      return GL_FALSE;
+   }
 
    for (i = 0; i < list->NumParameters; i++) {
       if (list->Parameters[i].Type == PROGRAM_CONSTANT) {