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

pipewire: allow NULL pointers in pw_properties_free()

Browse source 
Just like the real free() we should just ignore a NULL pointer, makes the
caller code easier for those instances where properties are optional.

Patch generated with concinelle with a few manual fixes.
This commit is contained in:
Peter Hutterer 2021-06-01 11:21:17 +10:00 • committed by Wim Taymans
parent a1e821c259
commit e0471c6757
68 changed files with 142 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,8 +120,7 @@ static int client_endpoint_stream_update(void *object,
: 0;
no_mem:
if (props)
pw_properties_free(props);
pw_properties_free(props);
free(stream);
pw_log_error(NAME" %p: cannot update stream: no memory", this);
pw_resource_errorf(this->resource, -ENOMEM,
@ -204,8 +203,7 @@ static void *create_object(void *data,
return this;
no_mem:
if (properties)
pw_properties_free(properties);
pw_properties_free(properties);
if (this && this->resource)
pw_resource_destroy(this->resource);
free(this);

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

@ -333,6 +333,5 @@ void endpoint_stream_clear(struct endpoint_stream *this)
free(this->info.link_params);
free(this->info.params);
if (this->props)
pw_properties_free(this->props);
pw_properties_free(this->props);
}

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

@ -365,6 +365,5 @@ void endpoint_clear(struct endpoint *this)
free(this->info.media_class);
free(this->info.params);
if (this->props)
pw_properties_free(this->props);
pw_properties_free(this->props);
}

6
src/modules/module-session-manager/client-session/client-session.c
View file

@ -119,8 +119,7 @@ static int client_session_link_update(void *object,
: 0;
no_mem:
if (props)
pw_properties_free(props);
pw_properties_free(props);
free(link);
pw_log_error(NAME" %p: cannot update link: no memory", this);
pw_resource_error(this->resource, -ENOMEM,
@ -203,8 +202,7 @@ static void *create_object(void *data,
return this;
no_mem:
if (properties)
pw_properties_free(properties);
pw_properties_free(properties);
if (this && this->resource)
pw_resource_destroy(this->resource);
free(this);

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

@ -350,6 +350,5 @@ void endpoint_link_clear(struct endpoint_link *this)
free(this->info.error);
free(this->info.params);
if (this->props)
pw_properties_free(this->props);
pw_properties_free(this->props);
}

3
src/modules/module-session-manager/client-session/session.c
View file

@ -325,6 +325,5 @@ void session_clear(struct session *this)
free(this->info.params);
if (this->props)
pw_properties_free(this->props);
pw_properties_free(this->props);
}