diff options
Diffstat (limited to 'src/pulse')
-rw-r--r-- | src/pulse/context.c | 3 | ||||
-rw-r--r-- | src/pulse/util.c | 3 | ||||
-rw-r--r-- | src/pulse/util.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 4aad737f..bfff0e17 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -902,7 +902,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo /* The system wide instance via PF_LOCAL */ c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET); - try_next_connection(c); + if (!c->client) + try_next_connection(c); finish: return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; diff --git a/src/pulse/util.c b/src/pulse/util.c index 54a188d5..6f1e40a9 100644 --- a/src/pulse/util.c +++ b/src/pulse/util.c @@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) { char *pa_path_get_filename(const char *p) { char *fn; - pa_assert(p); + if (!p) + return NULL; if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) return fn+1; diff --git a/src/pulse/util.h b/src/pulse/util.h index f6dd40cb..ad85653d 100644 --- a/src/pulse/util.h +++ b/src/pulse/util.h @@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l); char *pa_get_binary_name(char *s, size_t l); /** Return a pointer to the filename inside a path (which is the last - * component). */ + * component). If passed NULL will return NULL. */ char *pa_path_get_filename(const char *p); /** Wait t milliseconds */ |