mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

stream: fix some more leaks in error paths

Browse source
This commit is contained in:
Wim Taymans 2020-07-02 16:22:49 +02:00
parent 5295caf0f3
commit 21fc163c49
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pipewire/stream.c
View file

@ -1474,7 +1474,6 @@ pw_stream_connect(struct pw_stream *stream,
impl->warn_mlock = SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_RT_PROCESS); impl->warn_mlock = SPA_FLAG_IS_SET(flags, PW_STREAM_FLAG_RT_PROCESS);
pw_properties_set(stream->properties, "mem.warn-mlock", impl->warn_mlock ? "true" : "false"); pw_properties_set(stream->properties, "mem.warn-mlock", impl->warn_mlock ? "true" : "false");
if ((pw_properties_get(stream->properties, PW_KEY_MEDIA_CLASS) == NULL)) { if ((pw_properties_get(stream->properties, PW_KEY_MEDIA_CLASS) == NULL)) {
const char *media_type = pw_properties_get(stream->properties, PW_KEY_MEDIA_TYPE); const char *media_type = pw_properties_get(stream->properties, PW_KEY_MEDIA_TYPE);
pw_properties_setf(stream->properties, PW_KEY_MEDIA_CLASS, "Stream/%s/%s", pw_properties_setf(stream->properties, PW_KEY_MEDIA_CLASS, "Stream/%s/%s",
@ -1504,6 +1503,10 @@ pw_stream_connect(struct pw_stream *stream,
pw_log_debug(NAME" %p: creating node", stream); pw_log_debug(NAME" %p: creating node", stream);
props = pw_properties_copy(stream->properties); props = pw_properties_copy(stream->properties);
if (props == NULL) {
res = -errno;
goto error_node;
}
if ((str = pw_properties_get(props, PW_KEY_STREAM_MONITOR)) && if ((str = pw_properties_get(props, PW_KEY_STREAM_MONITOR)) &&
pw_properties_parse_bool(str)) { pw_properties_parse_bool(str)) {
@ -1533,6 +1536,7 @@ pw_stream_connect(struct pw_stream *stream,
PW_VERSION_NODE, PW_VERSION_NODE,
props, props,
0); 0);
props = NULL;
if (impl->node == NULL) { if (impl->node == NULL) {
res = -errno; res = -errno;
goto error_node; goto error_node;
@ -1540,6 +1544,7 @@ pw_stream_connect(struct pw_stream *stream,
} else { } else {
impl->node = follower; impl->node = follower;
pw_properties_free(props); pw_properties_free(props);
props = NULL;
} }
if (!SPA_FLAG_IS_SET(impl->flags, PW_STREAM_FLAG_INACTIVE)) if (!SPA_FLAG_IS_SET(impl->flags, PW_STREAM_FLAG_INACTIVE))
pw_impl_node_set_active(impl->node, true); pw_impl_node_set_active(impl->node, true);
@ -1560,12 +1565,17 @@ pw_stream_connect(struct pw_stream *stream,
error_connect: error_connect:
pw_log_error(NAME" %p: can't connect: %s", stream, spa_strerror(res)); pw_log_error(NAME" %p: can't connect: %s", stream, spa_strerror(res));
return res; goto exit_cleanup;
error_node: error_node:
pw_log_error(NAME" %p: can't make node: %s", stream, spa_strerror(res)); pw_log_error(NAME" %p: can't make node: %s", stream, spa_strerror(res));
return res; goto exit_cleanup;
error_proxy: error_proxy:
pw_log_error(NAME" %p: can't make proxy: %s", stream, spa_strerror(res)); pw_log_error(NAME" %p: can't make proxy: %s", stream, spa_strerror(res));
goto exit_cleanup;
exit_cleanup:
if (props)
pw_properties_free(props);
return res; return res;
} }