Move setting m_init to _imp_create_dynamic_impl().

Author: ericsnowcurrently

Python/import.c

@@ -3942,6 +3942,9 @@ _imp_create_dynamic_impl(PyObject *module, PyObject *spec, PyObject *file)
             goto finally;
         }
 
+        /* Remember pointer to module init function. */
+        res.def->m_base.m_init = p0;
+
         /* Remember the filename as the __file__ attribute */
         if (PyModule_AddObjectRef(mod, "__file__", info.filename) < 0) {
             PyErr_Clear(); /* Not important enough to report */

Python/importdl.c

@@ -218,11 +218,15 @@ _PyImport_RunModInitFunc(PyModInitFunction p0,
     struct _Py_ext_module_loader_result res = {0};
     const char *name_buf = PyBytes_AS_STRING(info->name_encoded);
 
+    /* Call the module init function. */
+
     /* Package context is needed for single-phase init */
     const char *oldcontext = _PyImport_SwapPackageContext(info->newcontext);
     PyObject *m = p0();
     _PyImport_SwapPackageContext(oldcontext);
 
+    /* Validate the result (and populate "res". */
+
     if (m == NULL) {
         if (!PyErr_Occurred()) {
             PyErr_Format(
@@ -284,9 +288,6 @@ _PyImport_RunModInitFunc(PyModInitFunction p0,
                          "module", name_buf);
             goto error;
         }
-
-        /* Remember pointer to module init function. */
-        res.def->m_base.m_init = p0;
     }
 
     assert(!PyErr_Occurred());