1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/glsl/builtin_functions.cpp b/mesalib/src/glsl/builtin_functions.cpp
index 5d8f171b9..ce78df12e 100644
--- a/mesalib/src/glsl/builtin_functions.cpp
+++ b/mesalib/src/glsl/builtin_functions.cpp
@@ -525,6 +525,9 @@ private:
  *  @{
  */
 builtin_builder::builtin_builder()
+   : shader(NULL),
+     gl_ModelViewProjectionMatrix(NULL),
+     gl_Vertex(NULL)
 {
    mem_ctx = NULL;
 }
@@ -1850,6 +1853,7 @@ builtin_builder::add_function(const char *name, ...)
 
       f->add_signature(sig);
    }
+   va_end(ap);
 
    shader->symbols->add_function(f);
 }