Fix memory corruption in ANGLE shader translator.

src/compiler/BuiltInFunctionEmulator.h

@@ -94,7 +94,7 @@ private:
 
     bool SetFunctionCalled(TBuiltInFunction function);
 
-    TVector<TBuiltInFunction> mFunctions;
+    std::vector<TBuiltInFunction> mFunctions;
 
     const bool* mFunctionMask;  // a boolean flag for each function.
     const char** mFunctionSource;

src/compiler/MapLongVariableNames.cpp

@@ -23,7 +23,7 @@ TString mapLongName(int id, const TString& name, bool isVarying)
 }  // anonymous namespace
 
 MapLongVariableNames::MapLongVariableNames(
-    TMap<TString, TString>& varyingLongNameMap)
+    std::map<std::string, std::string>& varyingLongNameMap)
     : mVaryingLongNameMap(varyingLongNameMap)
 {
 }
@@ -57,13 +57,13 @@ bool MapLongVariableNames::visitLoop(Visit, TIntermLoop* node)
 
 TString MapLongVariableNames::mapVaryingLongName(const TString& name)
 {
-    TMap<TString, TString>::const_iterator it = mVaryingLongNameMap.find(name);
+    std::map<std::string, std::string>::const_iterator it = mVaryingLongNameMap.find(name.c_str());
     if (it != mVaryingLongNameMap.end())
-        return (*it).second;
+        return (*it).second.c_str();
 
     int id = mVaryingLongNameMap.size();
     TString mappedName = mapLongName(id, name, true);
     mVaryingLongNameMap.insert(
-        TMap<TString, TString>::value_type(name, mappedName));
+        std::map<std::string, std::string>::value_type(name.c_str(), mappedName.c_str()));
     return mappedName;
 }

src/compiler/MapLongVariableNames.h

@@ -19,7 +19,7 @@
 // longer than MAX_IDENTIFIER_NAME_SIZE to MAX_IDENTIFIER_NAME_SIZE.
 class MapLongVariableNames : public TIntermTraverser {
 public:
-    MapLongVariableNames(TMap<TString, TString>& varyingLongNameMap);
+    MapLongVariableNames(std::map<std::string, std::string>& varyingLongNameMap);
 
     virtual void visitSymbol(TIntermSymbol*);
     virtual bool visitLoop(Visit, TIntermLoop*);
@@ -27,7 +27,7 @@ public:
 private:
     TString mapVaryingLongName(const TString& name);
 
-    TMap<TString, TString>& mVaryingLongNameMap;
+    std::map<std::string, std::string>& mVaryingLongNameMap;
 };
 
 #endif  // COMPILER_MAP_LONG_VARIABLE_NAMES_H_

src/compiler/ShHandle.h

@@ -101,7 +101,7 @@ private:
     TVariableInfoList uniforms;  // Active uniforms in the compiled shader.
 
     // Pair of long varying varibale name <originalName, mappedName>.
-    TMap<TString, TString> varyingLongNameMap;
+    std::map<std::string, std::string> varyingLongNameMap;
 };
 
 //