mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

introspect: handle NULL result from info updates

Browse source
This commit is contained in:
Wim Taymans 2022-10-27 20:03:57 +02:00
parent 552d4516b6
commit d2aa240767
3 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pipewire-v4l2/src/pipewire-v4l2.c
View file

@ -485,6 +485,8 @@ static void node_event_info(void *object, const struct pw_node_info *info)
uint32_t i; uint32_t i;
info = g->info = pw_node_info_merge(g->info, info, g->changed == 0); info = g->info = pw_node_info_merge(g->info, info, g->changed == 0);
if (info == NULL)
return;
pw_log_debug("update %d %"PRIu64, g->id, info->change_mask); pw_log_debug("update %d %"PRIu64, g->id, info->change_mask);

8
src/modules/module-protocol-pulse/manager.c
View file

@ -236,6 +236,8 @@ static void client_event_info(void *data, const struct pw_client_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
info = o->this.info = pw_client_info_merge(o->this.info, info, o->this.changed == 0); info = o->this.info = pw_client_info_merge(o->this.info, info, o->this.changed == 0);
if (info == NULL)
return;
if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS) if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS)
changed++; changed++;
@ -275,6 +277,8 @@ static void module_event_info(void *data, const struct pw_module_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
info = o->this.info = pw_module_info_merge(o->this.info, info, o->this.changed == 0); info = o->this.info = pw_module_info_merge(o->this.info, info, o->this.changed == 0);
if (info == NULL)
return;
if (info->change_mask & PW_MODULE_CHANGE_MASK_PROPS) if (info->change_mask & PW_MODULE_CHANGE_MASK_PROPS)
changed++; changed++;
@ -314,6 +318,8 @@ static void device_event_info(void *data, const struct pw_device_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
info = o->this.info = pw_device_info_merge(o->this.info, info, o->this.changed == 0); info = o->this.info = pw_device_info_merge(o->this.info, info, o->this.changed == 0);
if (info == NULL)
return;
if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS) if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS)
changed++; changed++;
@ -434,6 +440,8 @@ static void node_event_info(void *data, const struct pw_node_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->this.id, info->change_mask);
info = o->this.info = pw_node_info_merge(o->this.info, info, o->this.changed == 0); info = o->this.info = pw_node_info_merge(o->this.info, info, o->this.changed == 0);
if (info == NULL)
return;
if (info->change_mask & PW_NODE_CHANGE_MASK_STATE) if (info->change_mask & PW_NODE_CHANGE_MASK_STATE)
changed++; changed++;

30
src/tools/pw-dump.c
View file

@ -587,9 +587,11 @@ static void client_event_info(void *data, const struct pw_client_info *info)
struct object *o = data; struct object *o = data;
int changed = 0; int changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_client_info_update(o->info, info); info = o->info = pw_client_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS) if (info->change_mask & PW_CLIENT_CHANGE_MASK_PROPS)
changed++; changed++;
@ -644,12 +646,14 @@ static void module_dump(struct object *o)
static void module_event_info(void *data, const struct pw_module_info *info) static void module_event_info(void *data, const struct pw_module_info *info)
{ {
struct object *o = data; struct object *o = data;
int changed = 0; int changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_module_info_update(o->info, info); info = o->info = pw_module_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_MODULE_CHANGE_MASK_PROPS) if (info->change_mask & PW_MODULE_CHANGE_MASK_PROPS)
changed++; changed++;
@ -704,12 +708,14 @@ static void factory_dump(struct object *o)
static void factory_event_info(void *data, const struct pw_factory_info *info) static void factory_event_info(void *data, const struct pw_factory_info *info)
{ {
struct object *o = data; struct object *o = data;
int changed = 0; int changed = 0;
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_factory_info_update(o->info, info); info = o->info = pw_factory_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_FACTORY_CHANGE_MASK_PROPS) if (info->change_mask & PW_FACTORY_CHANGE_MASK_PROPS)
changed++; changed++;
@ -769,6 +775,8 @@ static void device_event_info(void *data, const struct pw_device_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_device_info_update(o->info, info); info = o->info = pw_device_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS) if (info->change_mask & PW_DEVICE_CHANGE_MASK_PROPS)
changed++; changed++;
@ -863,6 +871,8 @@ static void node_event_info(void *data, const struct pw_node_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_node_info_update(o->info, info); info = o->info = pw_node_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_NODE_CHANGE_MASK_STATE) if (info->change_mask & PW_NODE_CHANGE_MASK_STATE)
changed++; changed++;
@ -952,6 +962,8 @@ static void port_event_info(void *data, const struct pw_port_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_port_info_update(o->info, info); info = o->info = pw_port_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_PORT_CHANGE_MASK_PROPS) if (info->change_mask & PW_PORT_CHANGE_MASK_PROPS)
changed++; changed++;
@ -1044,6 +1056,8 @@ static void link_event_info(void *data, const struct pw_link_info *info)
pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask); pw_log_debug("object %p: id:%d change-mask:%08"PRIx64, o, o->id, info->change_mask);
info = o->info = pw_link_info_update(o->info, info); info = o->info = pw_link_info_update(o->info, info);
if (info == NULL)
return;
if (info->change_mask & PW_LINK_CHANGE_MASK_STATE) if (info->change_mask & PW_LINK_CHANGE_MASK_STATE)
changed++; changed++;