Add to names map even if it's a prefixed name

Previously, we skipped adding to the names map if it was a prefixed name. This prevents the mapping of glsl es to glsl names from being accessible by an outside client. Bug: b/158533223 Change-Id: Ib1d1e229ceb6d836df8dd0c30ea848b081a40cad Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2240637Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Lingfeng Yang <lfy@google.com> Commit-Queue: Lingfeng Yang <lfy@google.com>

Add to names map even if it's a prefixed name
98d0f30c · Lingfeng Yang · Commit Bot · af727792 · 98d0f30c
Commit 98d0f30c authored Jun 10, 2020 by Lingfeng Yang Committed by Commit Bot Jun 12, 2020
Show whitespace changes
Inline Side-by-side

Showing with 22 additions and 14 deletions

HashNames.cpp src/compiler/translator/HashNames.cpp +22 -14

No files found.
--- a/src/compiler/translator/HashNames.cpp
+++ b/src/compiler/translator/HashNames.cpp
@@ -36,6 +36,22 @@ ImmutableString HashName(const ImmutableString &name, ShHashFunction64 hashFunct
    return hashedName;
 }
+void AddToNameMapIfNotMapped(const ImmutableString &name,
+                             const ImmutableString &hashedName,
+                             NameMap *nameMap)
+{
+    if (nameMap)
+    {
+        NameMap::const_iterator it = nameMap->find(name.data());
+        if (it != nameMap->end())
+        {
+            // (How bout returning?)
+            return;
+        }
+        (*nameMap)[name.data()] = hashedName.data();
+    }
+}
 }  // anonymous namespace
 ImmutableString HashName(const ImmutableString &name,
@@ -84,22 +100,14 @@ ImmutableString HashName(const ImmutableString &name,
        }
        ImmutableStringBuilder prefixedName(kUnhashedNamePrefix.length() + name.length());
        prefixedName << kUnhashedNamePrefix << name;
-        return prefixedName;
+        ImmutableString res = prefixedName;
-    }
+        AddToNameMapIfNotMapped(name, res, nameMap);
-    if (nameMap)
+        return res;
-    {
-        NameMap::const_iterator it = nameMap->find(name.data());
-        if (it != nameMap->end())
-        {
-            // TODO(oetuaho): Would be nice if we didn't need to allocate a string here.
-            return ImmutableString(it->second);
-        }
    }
+    // Has a hash function
    ImmutableString hashedName = HashName(name, hashFunction);
-    if (nameMap)
+    AddToNameMapIfNotMapped(name, hashedName, nameMap);
-    {
-        (*nameMap)[name.data()] = hashedName.data();
-    }
    return hashedName;
 }