mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: don't try to destroy NULL

Browse source
This commit is contained in:
Wim Taymans 2017-10-19 15:48:40 +02:00
parent f19edc16ab
commit d3d557c166
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tools/pipewire-cli.c
View file

@ -280,6 +280,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t parent_id,
static void destroy_global(void *obj, void *data) static void destroy_global(void *obj, void *data)
{ {
struct global *global = obj; struct global *global = obj;
if (global == NULL) if (global == NULL)
return; return;
@ -827,6 +828,9 @@ static void do_global_info_all(void *obj, void *data)
struct global *global = obj; struct global *global = obj;
char *error; char *error;
if (global == NULL)
return;
if (!do_global_info(global, &error)) { if (!do_global_info(global, &error)) {
fprintf(stderr, "info: %s\n", error); fprintf(stderr, "info: %s\n", error);
free(error); free(error);
@ -846,7 +850,7 @@ static bool do_info(struct data *data, const char *cmd, char *args, char **error
asprintf(error, "%s <object-id>|all", cmd); asprintf(error, "%s <object-id>|all", cmd);
return false; return false;
} }
if (!strcmp(a[0], "all")) { if (strcmp(a[0], "all") == 0) {
pw_map_for_each(&rd->globals, do_global_info_all, NULL); pw_map_for_each(&rd->globals, do_global_info_all, NULL);
} }
else { else {