From 9ce0d92ae70362a1cd8c07c9f7ac25bcbcd09959 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 27 Aug 2010 14:35:52 -0600
Subject: mesa: move null ptr check (fdo bug 29843)

---
 src/mesa/main/shaderobj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 65d8d116db..59198d788b 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -104,9 +104,9 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
    assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||
           type == GL_GEOMETRY_SHADER_ARB);
    shader = talloc_zero(NULL, struct gl_shader);
-   shader->Type = type;
-   shader->Name = name;
    if (shader) {
+      shader->Type = type;
+      shader->Name = name;
       _mesa_init_shader(ctx, shader);
    }
    return shader;
-- 
cgit v1.2.3