commit b45306b795388b151df5abeb3703d1d7c925b713
author jacob.benoit.1@gmail.com <jacob.benoit.1@gmail.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon May 07 02:12:34 2012 +0000
committer jacob.benoit.1@gmail.com <jacob.benoit.1@gmail.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Mon May 07 02:12:34 2012 +0000
tree 59d3ae85811b19f587236d76978a72106126ceb3
parent 30a487c7288394ad26ed4a54846567bf868a8f13

Ensure that strings produced by getVariableInfo are always null-terminated
Issue 326



git-svn-id: https://angleproject.googlecode.com/svn/trunk@1070 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index c9dbebe..4e9abab 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1067
+#define BUILD_REVISION 1070
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/ShaderLang.cpp

diff --git a/src/compiler/ShaderLang.cpp b/src/compiler/ShaderLang.cpp
index 13f11b5..56f5c7f 100644
--- a/src/compiler/ShaderLang.cpp
+++ b/src/compiler/ShaderLang.cpp
@@ -72,12 +72,14 @@
     int activeUniformAndAttribLength = 1 + MAX_SYMBOL_NAME_LEN;
     ASSERT(checkActiveUniformAndAttribMaxLengths(handle, activeUniformAndAttribLength));
     strncpy(name, varInfo.name.c_str(), activeUniformAndAttribLength);
+    name[activeUniformAndAttribLength - 1] = 0;
     if (mappedName) {
         // This size must match that queried by
         // SH_MAPPED_NAME_MAX_LENGTH in ShGetInfo, below.
         int maxMappedNameLength = 1 + MAX_SYMBOL_NAME_LEN;
         ASSERT(checkMappedNameMaxLength(handle, maxMappedNameLength));
         strncpy(mappedName, varInfo.mappedName.c_str(), maxMappedNameLength);
+        mappedName[maxMappedNameLength - 1] = 0;
     }
 }