From ce42bdaab93a9c8678cbaa2bce1b4955d28f9459 Mon Sep 17 00:00:00 2001
From: KeterSCP <38229504+KeterSCP@users.noreply.github.com>
Date: Mon, 22 Jan 2024 22:55:57 +0100
Subject: [PATCH] Address CR feedback

---
 Cesium.Runtime/StdLibFunctions.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cesium.Runtime/StdLibFunctions.cs b/Cesium.Runtime/StdLibFunctions.cs
index f1da3cfc..3451bab7 100644
--- a/Cesium.Runtime/StdLibFunctions.cs
+++ b/Cesium.Runtime/StdLibFunctions.cs
@@ -29,7 +29,7 @@ public EnvVarsStorage(int bufferLength, Dictionary<string, int> indices)
     [FixedAddressValueType]
     private static int errNo;
 
-    private static EnvVarsStorage? _envVarsStorage;
+    private static readonly Lazy<EnvVarsStorage> _envVarsStorage = new(InitEnvVarsStorage);
 
     public static int Abs(int value)
     {
@@ -162,11 +162,9 @@ public static int Atoi(byte* ptr)
             return null;
         }
 
-        _envVarsStorage ??= InitEnvVarsStorage();
-
-        if (_envVarsStorage.Indices.TryGetValue(envKey, out var envValueIndex))
+        if (_envVarsStorage.Value.Indices.TryGetValue(envKey, out var envValueIndex))
         {
-            return _envVarsStorage.Values + envValueIndex;
+            return _envVarsStorage.Value.Values + envValueIndex;
         }
 
         return null;