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

protocol-native: ref the client while emiting error

Browse source 
Increase the client refcount while we emit an error to make sure
it doesn't get destroyed in the callbacks.

See #340
This commit is contained in:
Wim Taymans 2020-10-21 13:19:49 +02:00
parent 48d1b8d57d
commit 64913f4c7c
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/modules/module-protocol-native.c
View file

@ -727,12 +727,16 @@ on_remote_data(void *data, int fd, uint32_t mask)
{ {
struct client *impl = data; struct client *impl = data;
struct pw_core *this = impl->this.core; struct pw_core *this = impl->this.core;
struct pw_proxy *core_proxy = (struct pw_proxy*)this;
struct pw_protocol_native_connection *conn = impl->connection; struct pw_protocol_native_connection *conn = impl->connection;
struct pw_context *context = pw_core_get_context(this); struct pw_context *context = pw_core_get_context(this);
struct pw_loop *loop = pw_context_get_main_loop(context); struct pw_loop *loop = pw_context_get_main_loop(context);
int res; int res;
if (mask & (SPA_IO_ERR | SPA_IO_HUP)) { core_proxy->refcount++;
impl->ref++;
if (mask & (SPA_IO_ERR | SPA_IO_HUP)) {
res = -EPIPE; res = -EPIPE;
goto error; goto error;
} }
@ -748,20 +752,24 @@ on_remote_data(void *data, int fd, uint32_t mask)
goto error; goto error;
} }
if (mask & SPA_IO_IN) { if (mask & SPA_IO_IN) {
if ((res = process_remote(impl)) < 0) if ((res = process_remote(impl)) < 0)
goto error; goto error;
} }
done:
client_unref(impl);
pw_proxy_unref(core_proxy);
return; return;
error: error:
pw_log_debug(NAME" %p: got connection error %d (%s)", impl, res, spa_strerror(res)); pw_log_debug(NAME" %p: got connection error %d (%s)", impl, res, spa_strerror(res));
pw_proxy_notify((struct pw_proxy*)this,
struct pw_core_events, error, 0, 0,
this->recv_seq, res, "connection error");
if (impl->source) { if (impl->source) {
pw_loop_destroy_source(loop, impl->source); pw_loop_destroy_source(loop, impl->source);
impl->source = NULL; impl->source = NULL;
} }
pw_proxy_notify(core_proxy,
struct pw_core_events, error, 0, 0,
this->recv_seq, res, "connection error");
goto done;
} }
static void on_need_flush(void *data) static void on_need_flush(void *data)