commit 7c1cfd61549d50e3873ffc72d9a48998934180c8
author Kimmo Kinnunen <kkinnunen@nvidia.com> Wed Oct 15 14:59:57 2014 +0300
committer Shannon Woods <shannonwoods@chromium.org> Tue Oct 21 20:45:35 2014 +0000
tree 54265aa10321bdd1a3fc0ca05454c0aa53c8ad84
parent 710e57755132f5626f040548c69624d2a8d50f54

Make ShBuiltInResources comparable with memcmp

Chromium builds a std::map with ShBuiltInResources as part of the key.
Comparator for == and < are needed for the map implementation.

Currently Chromium uses memcmp as the comparator. Padding
in ShBuiltInResources causes uninitialized reads.

Fix this by clearing the padding with memset during ShBuiltInResources
initialization.

Change-Id: I78aa3c59ce165503831aa2a67c96cf8af316c152
Reviewed-on: https://chromium-review.googlesource.com/223431
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>

src/compiler/translator/ShaderLang.cpp

diff --git a/src/compiler/translator/ShaderLang.cpp b/src/compiler/translator/ShaderLang.cpp
index e0ed5f5..144ef90 100644
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -183,6 +183,9 @@
 //
 void ShInitBuiltInResources(ShBuiltInResources* resources)
 {
+    // Make comparable.
+    memset(resources, 0, sizeof(*resources));
+
     // Constants.
     resources->MaxVertexAttribs = 8;
     resources->MaxVertexUniformVectors = 128;