Solve some leaks in node loader port.

Author: viferga

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -377,6 +377,8 @@ typedef struct loader_impl_napi_to_value_callback_closure_type
 } * loader_impl_napi_to_value_callback_closure;
 
 /* Type conversion */
+static void node_loader_impl_napi_to_value_callback_finalizer(value v, void * data);
+
 static napi_value node_loader_impl_napi_to_value_callback(napi_env env, napi_callback_info info);
 
 /* Function */
@@ -836,6 +838,15 @@ value node_loader_impl_napi_to_value(loader_impl_node node_impl, napi_env env, n
 	return ret;
 }
 
+void node_loader_impl_napi_to_value_callback_finalizer(value v, void * data)
+{
+	loader_impl_napi_to_value_callback_closure closure = static_cast<loader_impl_napi_to_value_callback_closure>(data);
+
+	(void)v;
+
+	delete closure;
+}
+
 napi_value node_loader_impl_napi_to_value_callback(napi_env env, napi_callback_info info)
 {
 	size_t iterator, argc = 0;
@@ -861,24 +872,20 @@ napi_value node_loader_impl_napi_to_value_callback(napi_env env, napi_callback_i
 
 	void * ret = metacallfv_s(value_to_function(closure->func), args, argc);
 
-	// TODO: Implement finalizer where the closure is allocated
-
-	// IMPORTANT TODO:
-	//value_type_destroy(closure->func);
-
 	napi_value result = node_loader_impl_value_to_napi(closure->node_impl, env, ret);
 
+	/* Set result finalizer */
 	node_loader_impl_finalizer(env, result, ret);
 
+	/* Set closure finalizer */
+	value_finalizer(closure->func, &node_loader_impl_napi_to_value_callback_finalizer, closure);
+
 	/* Reset environment */
 	// closure->node_impl->env = NULL;
 
 	delete[] argv;
 	delete[] args;
 
-	// IMPORTANT TODO:
-	//delete closure;
-
 	return result;
 }
 
@@ -1042,6 +1049,8 @@ napi_value node_loader_impl_value_to_napi(loader_impl_node node_impl, napi_env e
 		status = napi_create_function(env, NULL, 0, node_loader_impl_napi_to_value_callback, closure, &v);
 
 		node_loader_impl_exception(env, status);
+
+		node_loader_impl_finalizer(env, v, closure->func);
 	}
 	else if (id == TYPE_CLASS)
 	{

source/loaders/node_loader/source/node_loader_port.cpp

@@ -72,27 +72,30 @@ napi_value node_loader_port_call(napi_env env, napi_callback_info info)
 
 	/* Obtain NodeJS loader implementation */
 	loader_impl impl = loader_get_impl("node");
-	loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
-
-	/* Store current reference of the environment */
+	loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
+
+	/* Store current reference of the environment */
 	node_loader_impl_env(node_impl, env);
 
 	for (size_t args_count = 1; args_count < argc; ++args_count)
 	{
 		args[args_count - 1] = node_loader_impl_napi_to_value(node_impl, env, recv, argv[args_count]);
-
-		node_loader_impl_finalizer(env, argv[args_count], args[args_count - 1]);
 	}
-
+
 	/* Call to the function */
 	void * ret = metacallv_s(name, args, argc - 1);
 
-	napi_value result = node_loader_impl_value_to_napi(node_impl, env, ret);
-
-	/* Release current reference of the environment */
+	napi_value result = node_loader_impl_value_to_napi(node_impl, env, ret);
+
+	/* Release current reference of the environment */
 	// node_loader_impl_env(node_impl, NULL);
 
-	node_loader_impl_finalizer(env, result, ret);
+	for (size_t args_count = 0; args_count < argc -1; ++args_count)
+	{
+		metacall_value_destroy(args[args_count]);
+	}
+
+	metacall_value_destroy(ret);
 
 	delete[] argv;
 	delete[] args;
@@ -153,20 +156,20 @@ napi_value node_loader_port_load_from_file(napi_env env, napi_callback_info info
 	}
 
 	if (path_index == paths_size)
-	{
+	{
 		/* Obtain NodeJS loader implementation */
 		loader_impl impl = loader_get_impl("node");
-		loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
-
-		/* Store current reference of the environment */
+		loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
+
+		/* Store current reference of the environment */
 		node_loader_impl_env(node_impl, env);
-
+
 		if (metacall_load_from_file(tag, (const char **)paths, paths_size, NULL) != 0)
 		{
 			napi_throw_error(env, NULL, "MetaCall could not load from file");
-		}
-
-		/* Release current reference of the environment */
+		}
+
+		/* Release current reference of the environment */
 		// node_loader_impl_env(node_impl, NULL);
 	}
 	else
@@ -253,23 +256,23 @@ napi_value node_loader_port_load_from_memory(napi_env env, napi_callback_info in
 	status = napi_get_value_string_utf8(env, argv[1], script, script_size, &script_length);
 
 	node_loader_impl_exception(env, status);
-
+
 	/* Obtain NodeJS loader implementation */
 	loader_impl impl = loader_get_impl("node");
-	loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
-
-	/* Store current reference of the environment */
+	loader_impl_node node_impl = (loader_impl_node)loader_impl_get(impl);
+
+	/* Store current reference of the environment */
 	node_loader_impl_env(node_impl, env);
-
+
 	// Load script from memory
 	if (metacall_load_from_memory(tag, script, script_size, NULL) != 0)
 	{
 		napi_throw_error(env, NULL, "MetaCall could not load from memory");
 	}
-
-	/* Release current reference of the environment */
+
+	/* Release current reference of the environment */
 	// node_loader_impl_env(node_impl, NULL);
-
+
 	free(tag);
 	free(script);