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

free() can handle NULL just fine so skip the check

Browse source 
Fixes #117
This commit is contained in:
Wim Taymans 2018-12-19 17:47:25 +01:00
parent 5390079b4a
commit 5c6bd8e5c7
10 changed files with 46 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/daemon-config.c
View file

@ -90,7 +90,7 @@ void pw_daemon_config_free(struct pw_daemon_config *config)
struct pw_command *cmd, *tmp; struct pw_command *cmd, *tmp;
spa_list_for_each_safe(cmd, tmp, &config->commands, link) spa_list_for_each_safe(cmd, tmp, &config->commands, link)
pw_command_free(cmd); pw_command_free(cmd);
free(config); free(config);
} }

1
src/modules/module-protocol-dbus.c
View file

@ -211,6 +211,7 @@ static void client_destroy(struct client *this)
if (this->sender) { if (this->sender) {
spa_list_remove(&this->link); spa_list_remove(&this->link);
free(this->sender); free(this->sender);
this->sender = NULL;
} }
} }

3
src/pipewire/factory.c
View file

@ -67,8 +67,7 @@ void pw_factory_destroy(struct pw_factory *factory)
spa_hook_remove(&factory->global_listener); spa_hook_remove(&factory->global_listener);
pw_global_destroy(factory->global); pw_global_destroy(factory->global);
} }
if (factory->info.name) free((char *)factory->info.name);
free((char *)factory->info.name);
if (factory->properties) if (factory->properties)
pw_properties_free(factory->properties); pw_properties_free(factory->properties);

72
src/pipewire/introspect.c
View file

@ -130,23 +130,19 @@ struct pw_core_info *pw_core_info_update(struct pw_core_info *info,
info->change_mask = update->change_mask; info->change_mask = update->change_mask;
if (update->change_mask & PW_CORE_CHANGE_MASK_USER_NAME) { if (update->change_mask & PW_CORE_CHANGE_MASK_USER_NAME) {
if (info->user_name) free((void *) info->user_name);
free((void *) info->user_name);
info->user_name = update->user_name ? strdup(update->user_name) : NULL; info->user_name = update->user_name ? strdup(update->user_name) : NULL;
} }
if (update->change_mask & PW_CORE_CHANGE_MASK_HOST_NAME) { if (update->change_mask & PW_CORE_CHANGE_MASK_HOST_NAME) {
if (info->host_name) free((void *) info->host_name);
free((void *) info->host_name);
info->host_name = update->host_name ? strdup(update->host_name) : NULL; info->host_name = update->host_name ? strdup(update->host_name) : NULL;
} }
if (update->change_mask & PW_CORE_CHANGE_MASK_VERSION) { if (update->change_mask & PW_CORE_CHANGE_MASK_VERSION) {
if (info->version) free((void *) info->version);
free((void *) info->version);
info->version = update->version ? strdup(update->version) : NULL; info->version = update->version ? strdup(update->version) : NULL;
} }
if (update->change_mask & PW_CORE_CHANGE_MASK_NAME) { if (update->change_mask & PW_CORE_CHANGE_MASK_NAME) {
if (info->name) free((void *) info->name);
free((void *) info->name);
info->name = update->name ? strdup(update->name) : NULL; info->name = update->name ? strdup(update->name) : NULL;
} }
if (update->change_mask & PW_CORE_CHANGE_MASK_COOKIE) if (update->change_mask & PW_CORE_CHANGE_MASK_COOKIE)
@ -161,14 +157,10 @@ struct pw_core_info *pw_core_info_update(struct pw_core_info *info,
void pw_core_info_free(struct pw_core_info *info) void pw_core_info_free(struct pw_core_info *info)
{ {
if (info->user_name) free((void *) info->user_name);
free((void *) info->user_name); free((void *) info->host_name);
if (info->host_name) free((void *) info->version);
free((void *) info->host_name); free((void *) info->name);
if (info->version)
free((void *) info->version);
if (info->name)
free((void *) info->name);
if (info->props) if (info->props)
pw_spa_dict_destroy(info->props); pw_spa_dict_destroy(info->props);
free(info); free(info);
@ -190,8 +182,7 @@ struct pw_node_info *pw_node_info_update(struct pw_node_info *info,
info->change_mask = update->change_mask; info->change_mask = update->change_mask;
if (update->change_mask & PW_NODE_CHANGE_MASK_NAME) { if (update->change_mask & PW_NODE_CHANGE_MASK_NAME) {
if (info->name) free((void *) info->name);
free((void *) info->name);
info->name = update->name ? strdup(update->name) : NULL; info->name = update->name ? strdup(update->name) : NULL;
} }
if (update->change_mask & PW_NODE_CHANGE_MASK_INPUT_PORTS) { if (update->change_mask & PW_NODE_CHANGE_MASK_INPUT_PORTS) {
@ -205,8 +196,7 @@ struct pw_node_info *pw_node_info_update(struct pw_node_info *info,
if (update->change_mask & PW_NODE_CHANGE_MASK_STATE) { if (update->change_mask & PW_NODE_CHANGE_MASK_STATE) {
info->state = update->state; info->state = update->state;
if (info->error) free((void *) info->error);
free((void *) info->error);
info->error = update->error ? strdup(update->error) : NULL; info->error = update->error ? strdup(update->error) : NULL;
} }
if (update->change_mask & PW_NODE_CHANGE_MASK_PROPS) { if (update->change_mask & PW_NODE_CHANGE_MASK_PROPS) {
@ -220,10 +210,8 @@ struct pw_node_info *pw_node_info_update(struct pw_node_info *info,
void pw_node_info_free(struct pw_node_info *info) void pw_node_info_free(struct pw_node_info *info)
{ {
if (info->name) free((void *) info->name);
free((void *) info->name); free((void *) info->error);
if (info->error)
free((void *) info->error);
if (info->props) if (info->props)
pw_spa_dict_destroy(info->props); pw_spa_dict_destroy(info->props);
free(info); free(info);
@ -245,8 +233,7 @@ struct pw_port_info *pw_port_info_update(struct pw_port_info *info,
info->change_mask = update->change_mask; info->change_mask = update->change_mask;
if (update->change_mask & PW_PORT_CHANGE_MASK_NAME) { if (update->change_mask & PW_PORT_CHANGE_MASK_NAME) {
if (info->name) free((void *) info->name);
free((void *) info->name);
info->name = update->name ? strdup(update->name) : NULL; info->name = update->name ? strdup(update->name) : NULL;
} }
if (update->change_mask & PW_PORT_CHANGE_MASK_PROPS) { if (update->change_mask & PW_PORT_CHANGE_MASK_PROPS) {
@ -260,8 +247,7 @@ struct pw_port_info *pw_port_info_update(struct pw_port_info *info,
void pw_port_info_free(struct pw_port_info *info) void pw_port_info_free(struct pw_port_info *info)
{ {
if (info->name) free((void *) info->name);
free((void *) info->name);
if (info->props) if (info->props)
pw_spa_dict_destroy(info->props); pw_spa_dict_destroy(info->props);
free(info); free(info);
@ -279,8 +265,7 @@ struct pw_factory_info *pw_factory_info_update(struct pw_factory_info *info,
return NULL; return NULL;
} }
info->id = update->id; info->id = update->id;
if (info->name) free((void *) info->name);
free((void *) info->name);
info->name = update->name ? strdup(update->name) : NULL; info->name = update->name ? strdup(update->name) : NULL;
info->type = update->type; info->type = update->type;
info->version = update->version; info->version = update->version;
@ -296,8 +281,7 @@ struct pw_factory_info *pw_factory_info_update(struct pw_factory_info *info,
void pw_factory_info_free(struct pw_factory_info *info) void pw_factory_info_free(struct pw_factory_info *info)
{ {
if (info->name) free((void *) info->name);
free((void *) info->name);
if (info->props) if (info->props)
pw_spa_dict_destroy(info->props); pw_spa_dict_destroy(info->props);
free(info); free(info);
@ -318,18 +302,15 @@ struct pw_module_info *pw_module_info_update(struct pw_module_info *info,
info->change_mask = update->change_mask; info->change_mask = update->change_mask;
if (update->change_mask & PW_MODULE_CHANGE_MASK_NAME) { if (update->change_mask & PW_MODULE_CHANGE_MASK_NAME) {
if (info->name) free((void *) info->name);
free((void *) info->name);
info->name = update->name ? strdup(update->name) : NULL; info->name = update->name ? strdup(update->name) : NULL;
} }
if (update->change_mask & PW_MODULE_CHANGE_MASK_FILENAME) { if (update->change_mask & PW_MODULE_CHANGE_MASK_FILENAME) {
if (info->filename) free((void *) info->filename);
free((void *) info->filename);
info->filename = update->filename ? strdup(update->filename) : NULL; info->filename = update->filename ? strdup(update->filename) : NULL;
} }
if (update->change_mask & PW_MODULE_CHANGE_MASK_ARGS) { if (update->change_mask & PW_MODULE_CHANGE_MASK_ARGS) {
if (info->args) free((void *) info->args);
free((void *) info->args);
info->args = update->args ? strdup(update->args) : NULL; info->args = update->args ? strdup(update->args) : NULL;
} }
if (update->change_mask & PW_MODULE_CHANGE_MASK_PROPS) { if (update->change_mask & PW_MODULE_CHANGE_MASK_PROPS) {
@ -342,12 +323,9 @@ struct pw_module_info *pw_module_info_update(struct pw_module_info *info,
void pw_module_info_free(struct pw_module_info *info) void pw_module_info_free(struct pw_module_info *info)
{ {
if (info->name) free((void *) info->name);
free((void *) info->name); free((void *) info->filename);
if (info->filename) free((void *) info->args);
free((void *) info->filename);
if (info->args)
free((void *) info->args);
if (info->props) if (info->props)
pw_spa_dict_destroy(info->props); pw_spa_dict_destroy(info->props);
free(info); free(info);
@ -406,8 +384,7 @@ struct pw_link_info *pw_link_info_update(struct pw_link_info *info,
info->input_port_id = update->input_port_id; info->input_port_id = update->input_port_id;
} }
if (update->change_mask & PW_LINK_CHANGE_MASK_FORMAT) { if (update->change_mask & PW_LINK_CHANGE_MASK_FORMAT) {
if (info->format) free(info->format);
free(info->format);
info->format = pw_spa_pod_copy(update->format); info->format = pw_spa_pod_copy(update->format);
} }
return info; return info;
@ -415,7 +392,6 @@ struct pw_link_info *pw_link_info_update(struct pw_link_info *info,
void pw_link_info_free(struct pw_link_info *info) void pw_link_info_free(struct pw_link_info *info)
{ {
if (info->format) free(info->format);
free(info->format);
free(info); free(info);
} }

11
src/pipewire/link.c
View file

@ -215,9 +215,7 @@ static int do_negotiate(struct pw_link *this, uint32_t in_state, uint32_t out_st
pw_work_queue_add(impl->work, input->node, res2, complete_ready, input); pw_work_queue_add(impl->work, input->node, res2, complete_ready, input);
} }
free(this->info.format);
if (this->info.format)
free(this->info.format);
this->info.format = format; this->info.format = format;
if (changed) { if (changed) {
@ -235,8 +233,7 @@ static int do_negotiate(struct pw_link *this, uint32_t in_state, uint32_t out_st
error: error:
pw_link_update_state(this, PW_LINK_STATE_ERROR, error); pw_link_update_state(this, PW_LINK_STATE_ERROR, error);
if (format) free(format);
free(format);
return res; return res;
} }
@ -1311,9 +1308,7 @@ void pw_link_destroy(struct pw_link *link)
if (link->properties) if (link->properties)
pw_properties_free(link->properties); pw_properties_free(link->properties);
if (link->info.format) free(link->info.format);
free(link->info.format);
free(impl); free(impl);
} }

9
src/pipewire/module.c
View file

@ -299,12 +299,9 @@ void pw_module_destroy(struct pw_module *module)
spa_list_for_each_safe(resource, tmp, &module->resource_list, link) spa_list_for_each_safe(resource, tmp, &module->resource_list, link)
pw_resource_destroy(resource); pw_resource_destroy(resource);
if (module->info.name) free((char *) module->info.name);
free((char *) module->info.name); free((char *) module->info.filename);
if (module->info.filename) free((char *) module->info.args);
free((char *) module->info.filename);
if (module->info.args)
free((char *) module->info.args);
dlclose(impl->hnd); dlclose(impl->hnd);
free(impl); free(impl);

6
src/pipewire/node.c
View file

@ -654,8 +654,7 @@ void pw_node_destroy(struct pw_node *node)
pw_map_clear(&node->input_port_map); pw_map_clear(&node->input_port_map);
pw_map_clear(&node->output_port_map); pw_map_clear(&node->output_port_map);
if (node->properties) pw_properties_free(node->properties);
pw_properties_free(node->properties);
clear_info(node); clear_info(node);
@ -922,8 +921,7 @@ void pw_node_update_state(struct pw_node *node, enum pw_node_state state, char *
pw_log_debug("node %p: update state from %s -> %s", node, pw_log_debug("node %p: update state from %s -> %s", node,
pw_node_state_as_string(old), pw_node_state_as_string(state)); pw_node_state_as_string(old), pw_node_state_as_string(state));
if (node->info.error) free((char*)node->info.error);
free((char*)node->info.error);
node->info.error = error; node->info.error = error;
node->info.state = state; node->info.state = state;

3
src/pipewire/port.c
View file

@ -564,8 +564,7 @@ void pw_port_destroy(struct pw_port *port)
pw_map_clear(&port->mix_port_map); pw_map_clear(&port->mix_port_map);
if (port->properties) pw_properties_free(port->properties);
pw_properties_free(port->properties);
free(port); free(port);
} }

10
src/pipewire/remote.c
View file

@ -124,8 +124,7 @@ pw_remote_update_state(struct pw_remote *remote, enum pw_remote_state state, con
enum pw_remote_state old = remote->state; enum pw_remote_state old = remote->state;
if (old != state) { if (old != state) {
if (remote->error) free(remote->error);
free(remote->error);
if (fmt) { if (fmt) {
va_list varargs; va_list varargs;
@ -305,8 +304,9 @@ void pw_remote_destroy(struct pw_remote *remote)
spa_list_remove(&remote->link); spa_list_remove(&remote->link);
if (remote->properties) pw_log_debug("remote %p: free", remote);
pw_properties_free(remote->properties); pw_properties_free(remote->properties);
free(remote->error); free(remote->error);
free(impl); free(impl);
} }
@ -452,7 +452,7 @@ int pw_remote_disconnect(struct pw_remote *remote)
remote->n_types = 0; remote->n_types = 0;
if (remote->info) { if (remote->info) {
pw_core_info_free (remote->info); pw_core_info_free(remote->info);
remote->info = NULL; remote->info = NULL;
} }
pw_remote_update_state(remote, PW_REMOTE_STATE_UNCONNECTED, NULL); pw_remote_update_state(remote, PW_REMOTE_STATE_UNCONNECTED, NULL);

16
src/pipewire/stream.c
View file

@ -304,8 +304,7 @@ static bool stream_set_state(struct pw_stream *stream, enum pw_stream_state stat
enum pw_stream_state old = stream->state; enum pw_stream_state old = stream->state;
bool res = old != state; bool res = old != state;
if (res) { if (res) {
if (stream->error) free(stream->error);
free(stream->error);
stream->error = error; stream->error = error;
pw_log_debug("stream %p: update state from %s -> %s (%s)", stream, pw_log_debug("stream %p: update state from %s -> %s (%s)", stream,
@ -540,14 +539,10 @@ void pw_stream_destroy(struct pw_stream *stream)
pw_array_clear(&impl->mem_ids); pw_array_clear(&impl->mem_ids);
if (stream->error) free(stream->error);
free(stream->error); free(stream->name);
if (stream->name) pw_properties_free(stream->properties);
free(stream->name);
if (stream->properties)
pw_properties_free(stream->properties);
free(impl); free(impl);
} }
@ -948,8 +943,7 @@ client_node_port_set_param(void *data,
pw_log_debug("stream %p: format changed %d", stream, seq); pw_log_debug("stream %p: format changed %d", stream, seq);
if (impl->format) free(impl->format);
free(impl->format);
if (spa_pod_is_object_type(param, t->spa_format)) { if (spa_pod_is_object_type(param, t->spa_format)) {
impl->format = pw_spa_pod_copy(param); impl->format = pw_spa_pod_copy(param);