From 015cb4ce5c6195f79ff673051e10366af9a264df Mon Sep 17 00:00:00 2001
From: Arcady Goldmints-Orlov <arcady@lunarg.com>
Date: Fri, 2 Aug 2024 18:19:50 -0600
Subject: [PATCH] Fix initialization of arrays in TGlslIoMapper

The inVarMaps, outVarMaps, uniformVarMap, and intermediates arrays were
being memset with a size 1 bigger than their actual size. They are now
initialized correctly, which also allows making inVarMaps, outVarMaps,
and uniformVarMap into private members.
---
 glslang/MachineIndependent/iomapper.cpp | 8 ++++----
 glslang/MachineIndependent/iomapper.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/glslang/MachineIndependent/iomapper.cpp b/glslang/MachineIndependent/iomapper.cpp
index e49ca4b1..3e7749d3 100644
--- a/glslang/MachineIndependent/iomapper.cpp
+++ b/glslang/MachineIndependent/iomapper.cpp
@@ -1601,10 +1601,10 @@ bool TIoMapper::addStage(EShLanguage stage, TIntermediate& intermediate, TInfoSi
 }
 
 TGlslIoMapper::TGlslIoMapper() {
-    memset(inVarMaps,     0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
-    memset(outVarMaps,    0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
-    memset(uniformVarMap, 0, sizeof(TVarLiveMap*)   * (EShLangCount + 1));
-    memset(intermediates, 0, sizeof(TIntermediate*) * (EShLangCount + 1));
+    memset(inVarMaps,     0, sizeof(TVarLiveMap*)   * EShLangCount);
+    memset(outVarMaps,    0, sizeof(TVarLiveMap*)   * EShLangCount);
+    memset(uniformVarMap, 0, sizeof(TVarLiveMap*)   * EShLangCount);
+    memset(intermediates, 0, sizeof(TIntermediate*) * EShLangCount);
     profile = ENoProfile;
     version = 0;
     autoPushConstantMaxSize = 128;
diff --git a/glslang/MachineIndependent/iomapper.h b/glslang/MachineIndependent/iomapper.h
index 484b0ecc..ef73c273 100644
--- a/glslang/MachineIndependent/iomapper.h
+++ b/glslang/MachineIndependent/iomapper.h
@@ -214,8 +214,6 @@ public:
     // grow the reflection stage by stage
     bool addStage(EShLanguage, TIntermediate&, TInfoSink&, TIoMapResolver*) override;
     bool doMap(TIoMapResolver*, TInfoSink&) override;
-    TVarLiveMap *inVarMaps[EShLangCount], *outVarMaps[EShLangCount],
-                *uniformVarMap[EShLangCount];
     TIntermediate* intermediates[EShLangCount];
     bool hadError = false;
     EProfile profile;
@@ -225,6 +223,8 @@ private:
     TString autoPushConstantBlockName;
     unsigned int autoPushConstantMaxSize;
     TLayoutPacking autoPushConstantBlockPacking;
+    TVarLiveMap *inVarMaps[EShLangCount], *outVarMaps[EShLangCount],
+                *uniformVarMap[EShLangCount];
 };
 
 } // end namespace glslang