Fix crash on multiple calls to ShInitialize().

The previous fix would allow the calling app to trigger an ASSERT if it did not first call ShFinalize. Chrome would do this in some cases, causing a test failure. BUG=344043 Change-Id: I33fa0c4668dac8750ca949febc7f02cc7d3d95e7 Reviewed-on: https://chromium-review.googlesource.com/187849Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix crash on multiple calls to ShInitialize().
477bc781 · Jamie Madill · 1d1c1152 · 477bc781
Commit 477bc781 authored Feb 26, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ShaderLang.cpp src/compiler/translator/ShaderLang.cpp +4 -1

No files found.
--- a/src/compiler/translator/ShaderLang.cpp
+++ b/src/compiler/translator/ShaderLang.cpp
@@ -51,7 +51,10 @@ static bool checkMappedNameMaxLength(const ShHandle handle, size_t expectedValue
 //
 int ShInitialize()
 {
-    isInitialized = InitProcess();
+    if (!isInitialized)
+    {
+        isInitialized = InitProcess();
+    }
    return isInitialized ? 1 : 0;
 }