Fixed dict usage before Python initialization (thanks to spitice)

Author: Ayuto

src/core/export_main.cpp

@@ -85,3 +85,12 @@ bool modulsp_init( void )
 	END_BOOST_PY(false)
 	return true;
 }
+
+
+dict& DeferredDict::get() {
+	if (!_pDict) {
+		_pDict = std::make_shared<dict>();
+	}
+
+	return *_pDict;
+}

src/core/export_main.h

@@ -55,6 +55,18 @@ typedef void (*ModuleInitFn)( scope );
 	static CSPModule g_##package##_##name##_Init( XSTRINGIFY(package.name), &PyInit_##package##_##name ); \
 	void PyInit_##package##_##name( scope name )
 
+//---------------------------------------------------------------------------------
+// A deferred version of boost::python::dict. Thanks to spitice!
+// There was a change in Python that results in an access violation when Python is
+// not ready, yet.
+//---------------------------------------------------------------------------------
+class DeferredDict {
+private:
+	std::shared_ptr<dict> _pDict;
+public:
+	dict& get();
+};
+
 //---------------------------------------------------------------------------------
 // This is a module definition structure. The way our module system is going to
 // work is you declare a module via BOOST_PYTHON_MODULE. Then the CPythonManager

src/core/modules/memory/memory_utilities.h

@@ -147,8 +147,8 @@ T* __obj__(CPointer* pPtr)
 // ============================================================================
 // Use this macro to add the class to the ExposedClasses dict
 #define STORE_CLASS(classname, pyname) \
-	extern dict g_oExposedClasses; \
-	g_oExposedClasses[XSTRINGIFY(classname)] = scope().attr(pyname);
+	extern DeferredDict g_oExposedClasses; \
+	g_oExposedClasses.get()[XSTRINGIFY(classname)] = scope().attr(pyname);
 
 
 // ============================================================================
@@ -202,12 +202,12 @@ END_CLASS_INFO()
 #define BEGIN_CLASS_INFO(classname) \
 	{ \
 		typedef classname functionInfoClass; \
-		extern dict g_oClassInfo; \
+		extern DeferredDict g_oClassInfo; \
 		dict classInfoDict; \
-		if (g_oClassInfo.contains( #classname )) \
-			classInfoDict = extract<dict>(g_oClassInfo[ #classname ]); \
+		if (g_oClassInfo.get().contains( #classname )) \
+			classInfoDict = extract<dict>(g_oClassInfo.get()[ #classname ]); \
 		else \
-			g_oClassInfo[ #classname ] = classInfoDict;
+			g_oClassInfo.get()[ #classname ] = classInfoDict;
 
 // Finish a class info dictionary
 #define END_CLASS_INFO() \

src/core/modules/memory/memory_wrap.cpp

@@ -1018,16 +1018,16 @@ void export_functions(scope _memory)
 // ============================================================================
 // >> GLOBAL VARIABLES
 // ============================================================================
-dict g_oExposedClasses;
-dict g_oClassInfo;
+DeferredDict g_oExposedClasses;
+DeferredDict g_oClassInfo;
 
 #define ADD_NATIVE_TYPE_SIZE(name, type) \
 	scope().attr("TYPE_SIZES")[name] = sizeof(type);
 
 void export_global_variables(scope _memory)
 {
-	_memory.attr("EXPOSED_CLASSES") = g_oExposedClasses;
-	_memory.attr("CLASS_INFO") = g_oClassInfo;
+	_memory.attr("EXPOSED_CLASSES") = g_oExposedClasses.get();
+	_memory.attr("CLASS_INFO") = g_oClassInfo.get();
 
 	// Don't remove this! It's required for the ADD_NATIVE_TYPE_SIZE macro.
 	_memory.attr("TYPE_SIZES") = dict();