mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

module: handle type register errors

Browse source 
Registering an export type can give an error when the type is already
registered. Handle those errors and refuse to load the module.

See #2281
This commit is contained in:
Wim Taymans 2022-04-11 21:15:13 +02:00
parent 37fa911a72
commit b97327e1f6
7 changed files with 50 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-client-device.c
View file

@ -175,6 +175,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
PW_LOG_TOPIC_INIT(mod_topic);
factory = pw_context_create_factory(context,
@ -198,15 +199,19 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
&impl_factory,
data);
pw_protocol_native_ext_client_device_init(context);
data->export_spadevice.type = SPA_TYPE_INTERFACE_Device;
data->export_spadevice.func = pw_core_spa_device_export;
pw_context_register_export_type(context, &data->export_spadevice);
if ((res = pw_context_register_export_type(context, &data->export_spadevice)) < 0)
goto error;
pw_protocol_native_ext_client_device_init(context);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}

18
src/modules/module-client-node.c
View file

@ -163,6 +163,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
PW_LOG_TOPIC_INIT(mod_topic);
@ -185,20 +186,27 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
&impl_factory,
data);
pw_protocol_native_ext_client_node_init(context);
pw_protocol_native_ext_client_node0_init(context);
data->export_node.type = PW_TYPE_INTERFACE_Node;
data->export_node.func = pw_core_node_export;
pw_context_register_export_type(context, &data->export_node);
if ((res = pw_context_register_export_type(context, &data->export_node)) < 0)
goto error;
data->export_spanode.type = SPA_TYPE_INTERFACE_Node;
data->export_spanode.func = pw_core_spa_node_export;
pw_context_register_export_type(context, &data->export_spanode);
if ((res = pw_context_register_export_type(context, &data->export_spanode)) < 0)
goto error_remove;
pw_protocol_native_ext_client_node_init(context);
pw_protocol_native_ext_client_node0_init(context);
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
return 0;
error_remove:
spa_list_remove(&data->export_node.link);
error:
pw_impl_factory_destroy(data->this);
return res;
}

6
src/modules/module-metadata.c
View file

@ -212,11 +212,15 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
data->export_metadata.type = PW_TYPE_INTERFACE_Metadata;
data->export_metadata.func = pw_core_metadata_export;
pw_context_register_export_type(context, &data->export_metadata);
if ((res = pw_context_register_export_type(context, &data->export_metadata)) < 0)
goto error;
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
pw_impl_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}

7
src/modules/module-session-manager/endpoint-link.c
View file

@ -540,6 +540,7 @@ int endpoint_link_factory_init(struct pw_impl_module *module)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
factory = pw_context_create_factory(context,
"endpoint-link",
@ -558,9 +559,13 @@ int endpoint_link_factory_init(struct pw_impl_module *module)
data->export.type = PW_TYPE_INTERFACE_EndpointLink;
data->export.func = pw_core_endpoint_link_export;
pw_context_register_export_type(context, &data->export);
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}

7
src/modules/module-session-manager/endpoint-stream.c
View file

@ -531,6 +531,7 @@ int endpoint_stream_factory_init(struct pw_impl_module *module)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
factory = pw_context_create_factory(context,
"endpoint-stream",
@ -549,9 +550,13 @@ int endpoint_stream_factory_init(struct pw_impl_module *module)
data->export.type = PW_TYPE_INTERFACE_EndpointStream;
data->export.func = pw_core_endpoint_stream_export;
pw_context_register_export_type(context, &data->export);
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}

7
src/modules/module-session-manager/endpoint.c
View file

@ -540,6 +540,7 @@ int endpoint_factory_init(struct pw_impl_module *module)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
factory = pw_context_create_factory(context,
"endpoint",
@ -558,9 +559,13 @@ int endpoint_factory_init(struct pw_impl_module *module)
data->export.type = PW_TYPE_INTERFACE_Endpoint;
data->export.func = pw_core_endpoint_export;
pw_context_register_export_type(context, &data->export);
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}

7
src/modules/module-session-manager/session.c
View file

@ -529,6 +529,7 @@ int session_factory_init(struct pw_impl_module *module)
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
factory = pw_context_create_factory(context,
"session",
@ -547,9 +548,13 @@ int session_factory_init(struct pw_impl_module *module)
data->export.type = PW_TYPE_INTERFACE_Session;
data->export.func = pw_core_session_export;
pw_context_register_export_type(context, &data->export);
if ((res = pw_context_register_export_type(context, &data->export)) < 0)
goto error;
pw_impl_module_add_listener(module, &data->module_listener, &module_events, data);
return 0;
error:
pw_impl_factory_destroy(data->this);
return res;
}