mesa: move null ptr check (fdo bug 29843)

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 65d8d116db1d3be6d7ad6171c8a5a0a2e65352f8..59198d788bd093ca3df8e55a414863e3c89e39f9 100644 (file)
--- 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;