Mesa (10.4): mesa: Correct backwards NULL check.

Emil Velikov evelikov at kemper.freedesktop.org
Wed Mar 4 02:02:53 UTC 2015


Module: Mesa
Branch: 10.4
Commit: a598a9bdfe9f5d0ed35ca89a55cf74a2b678e8e1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a598a9bdfe9f5d0ed35ca89a55cf74a2b678e8e1

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sat Feb 28 11:14:02 2015 -0800

mesa: Correct backwards NULL check.

Cc: "10.4, 10.5" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 491d42135ad0e5670756216154f2ba9fc79d4ba7)
[Emil Velikov: the patch hunk has a different offset.]
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Conflicts:
	src/mesa/main/shaderapi.c

---

 src/mesa/main/shaderapi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 6657820..94f6b76 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1704,7 +1704,7 @@ _mesa_GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei *length,
     *
     *     "If <length> is NULL, then no length is returned."
     */
-   if (length != NULL)
+   if (length == NULL)
       *length = 0;
 
    (void) binaryFormat;




More information about the mesa-commit mailing list