Solve more memory issues in py_loader.

Author: viferga

source/loaders/py_loader/include/py_loader/py_loader_func.h

@@ -35,6 +35,8 @@ PY_LOADER_NO_EXPORT int py_loader_impl_func_type_init(void);
 
 PY_LOADER_NO_EXPORT int py_loader_impl_func_check(PyObject *obj);
 
+PY_LOADER_NO_EXPORT void *py_loader_impl_func_copy(PyObject *obj);
+
 PY_LOADER_NO_EXPORT PyObject *py_loader_impl_func_new(loader_impl impl, loader_impl_py py_impl, value callback);
 
 #ifdef __cplusplus

source/loaders/py_loader/source/py_loader_func.c

@@ -187,6 +187,18 @@ int py_loader_impl_func_check(PyObject *obj)
 	return PyObject_TypeCheck(obj, &py_loader_impl_func_type);
 }
 
+void *py_loader_impl_func_copy(PyObject *obj)
+{
+	struct py_loader_impl_func_obj *wrapped = (struct py_loader_impl_func_obj *)obj;
+
+	if (wrapped == NULL)
+	{
+		return NULL;
+	}
+
+	return metacall_value_copy(wrapped->callback);
+}
+
 PyObject *py_loader_impl_func_new(loader_impl impl, loader_impl_py py_impl, value callback)
 {
 	struct py_loader_impl_func_obj *wrapped = PyObject_New(struct py_loader_impl_func_obj, &py_loader_impl_func_type);

source/loaders/py_loader/source/py_loader_impl.c

@@ -1064,49 +1064,38 @@ value py_loader_impl_capi_to_value(loader_impl impl, PyObject *obj, type_id id)
 	}
 	else if (id == TYPE_FUNCTION)
 	{
-/* Check if we are passing our own hook to the callback */
-#if 0 /* TODO: This optimization does not work properly (check metacall-node-port-test for implementing it) */
-		if (PyCFunction_Check(obj) && PyCFunction_GET_FUNCTION(obj) == py_loader_impl_function_type_invoke)
+		/* Check if we are passing our own hook to the callback */
+		if (py_loader_impl_func_check(obj))
 		{
-			PyObject *invoke_state_capsule = PyCFunction_GET_SELF(obj);
-
-			loader_impl_py_function_type_invoke_state invoke_state = PyCapsule_GetPointer(invoke_state_capsule, NULL);
-
-			value callback = value_type_copy(invoke_state->callback);
-
-			/* Move finalizers */
-			value_move(callback, invoke_state->callback);
-
-			Py_DecRef(invoke_state_capsule);
-
-			return callback;
+			return py_loader_impl_func_copy(obj);
 		}
-#endif
+		else
+		{
+			loader_impl_py py_impl = loader_impl_get(impl);
+			size_t args_count = py_loader_impl_discover_callable_args_count(py_impl, obj);
+			loader_impl_py_function py_func = malloc(sizeof(struct loader_impl_py_function_type));
+			function f = NULL;
 
-		loader_impl_py py_impl = loader_impl_get(impl);
-		size_t args_count = py_loader_impl_discover_callable_args_count(py_impl, obj);
-		loader_impl_py_function py_func = malloc(sizeof(struct loader_impl_py_function_type));
-		function f = NULL;
+			if (py_func == NULL)
+			{
+				return NULL;
+			}
 
-		if (py_func == NULL)
-		{
-			return NULL;
-		}
+			Py_IncRef(obj);
+			py_func->func = obj;
+			py_func->impl = impl;
 
-		Py_IncRef(obj);
-		py_func->func = obj;
-		py_func->impl = impl;
+			f = function_create(NULL, args_count, py_func, &function_py_singleton);
 
-		f = function_create(NULL, args_count, py_func, &function_py_singleton);
+			if (py_loader_impl_discover_func(impl, obj, f) != 0)
+			{
+				function_destroy(f);
 
-		if (py_loader_impl_discover_func(impl, obj, f) != 0)
-		{
-			function_destroy(f);
+				return NULL;
+			}
 
-			return NULL;
+			return value_create_function(f);
 		}
-
-		return value_create_function(f);
 	}
 	else if (id == TYPE_NULL)
 	{
@@ -3797,6 +3786,20 @@ int py_loader_impl_discover_module(loader_impl impl, PyObject *module, context c
 				return 1;
 			}
 		}
+		else if (py_loader_impl_func_check(module_dict_val))
+		{
+			/* This special case for our own functions skips the introspection phase */
+			const char *func_name = PyUnicode_AsUTF8(module_dict_key);
+			scope sp = context_scope(ctx);
+			value v = py_loader_impl_func_copy(module_dict_val);
+
+			if (scope_define(sp, func_name, v) != 0)
+			{
+				py_loader_thread_release();
+				value_type_destroy(v);
+				return 1;
+			}
+		}
 		else if (PyCallable_Check(module_dict_val))
 		{
 			const char *func_name = PyUnicode_AsUTF8(module_dict_key);