Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2

2021-11-16 11:41:39 -08:00
parent 6080801c55 e0d736dd84
commit 4ab3bd487f
1 changed files with 6 additions and 1 deletions
@@ -32,7 +32,12 @@ namespace AZ

        if (!s_instance)
        {
-            s_instance = AZ::Environment::CreateVariable<NameDictionary>(NameDictionaryInstanceName);
+            // Because the NameDictionary allocates memory using the AZ::Allocator and it is created
+            // in the executable memory space, it's ownership cannot be transferred to other module memory spaces
+            // Otherwise this could cause the the NameDictionary to be destroyed in static de-init
+            // after the AZ::Allocators have been destroyed
+            // Therefore we supply the isTransferOwnership value of false using CreateVariableEx
+            s_instance = AZ::Environment::CreateVariableEx<NameDictionary>(NameDictionaryInstanceName, true, false);
        }
    }