mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-18 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: use %u format specifier for uint32_t IDs

Browse source 
The object, node, client, factory, module, and link IDs are all uint32_t values but were being formatted with %d.
This would produce incorrect negative values if an ID ever exceeded INT_MAX
This commit is contained in:
zuozhiwei 2026-04-16 10:53:06 +08:00 • committed by Wim Taymans
parent 35cbd2e56a
commit b4457b871f
26 changed files with 51 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pipewire-jack/src/pipewire-jack.c
View file

@ -6513,10 +6513,10 @@ int jack_connect (jack_client_t *client,
if ((res = check_connect(c, src, dst)) != 1)
goto exit;
snprintf(val[0], sizeof(val[0]), "%d", src->port.node_id);
snprintf(val[1], sizeof(val[1]), "%d", src->id);
snprintf(val[2], sizeof(val[2]), "%d", dst->port.node_id);
snprintf(val[3], sizeof(val[3]), "%d", dst->id);
snprintf(val[0], sizeof(val[0]), "%u", src->port.node_id);
snprintf(val[1], sizeof(val[1]), "%u", src->id);
snprintf(val[2], sizeof(val[2]), "%u", dst->port.node_id);
snprintf(val[3], sizeof(val[3]), "%u", dst->id);
props = SPA_DICT_INIT(items, 0);
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_LINK_OUTPUT_NODE, val[0]);

6
src/modules/module-adapter.c
View file

@ -184,7 +184,7 @@ static void *create_object(void *_data,
if (properties == NULL)
goto error_properties;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false);
@ -196,7 +196,7 @@ static void *create_object(void *_data,
client = resource ? pw_resource_get_client(resource): NULL;
if (client && !linger) {
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
}
@ -343,7 +343,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

4
src/modules/module-client-device.c
View file

@ -135,9 +135,9 @@ static void *create_object(void *_data,
goto error_properties;
}
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_global_get_id(pw_impl_factory_get_global(factory)));
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_global_get_id(pw_impl_client_get_global(client)));
result = pw_client_device_new(device_resource, properties);

2
src/modules/module-client-device/resource-device.c
View file

@ -108,7 +108,7 @@ struct pw_impl_device *pw_client_device_new(struct pw_resource *resource,
if (properties == NULL)
return NULL;
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
device = pw_context_create_device(context, properties, sizeof(struct impl));

2
src/modules/module-client-node/client-node.c
View file

@ -1764,7 +1764,7 @@ struct pw_impl_client_node *pw_impl_client_node_new(struct pw_resource *resource
goto error_exit_free;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", client->global->id);
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u", client->global->id);
this = &impl->this;

4
src/modules/module-link-factory.c
View file

@ -485,12 +485,12 @@ static void *create_object(void *_data,
linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
client = resource ? pw_resource_get_client(resource) : NULL;
if (client && !linger)
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
if (!d->allow_passive)

6
src/modules/module-metadata.c
View file

@ -203,9 +203,9 @@ static void *create_object(void *_data,
if (properties == NULL)
return NULL;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(data->factory)->id);
pw_properties_setf(properties, PW_KEY_MODULE_ID, "%d",
pw_properties_setf(properties, PW_KEY_MODULE_ID, "%u",
pw_impl_module_get_info(data->module)->id);
if (pw_properties_get(properties, PW_KEY_METADATA_NAME) == NULL)
@ -218,7 +218,7 @@ static void *create_object(void *_data,
goto error_resource;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
result = pw_metadata_new(context, metadata_resource, properties);

2
src/modules/module-profiler.c
View file

@ -559,7 +559,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
free(impl);
return -errno;
}
pw_properties_setf(impl->properties, PW_KEY_OBJECT_ID, "%d", pw_global_get_id(impl->global));
pw_properties_setf(impl->properties, PW_KEY_OBJECT_ID, "%u", pw_global_get_id(impl->global));
pw_properties_setf(impl->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(impl->global));

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

@ -663,7 +663,7 @@ static struct client_data *client_new(struct server *s, int fd)
}
#endif
pw_properties_setf(props, PW_KEY_MODULE_ID, "%d", d->module->global->id);
pw_properties_setf(props, PW_KEY_MODULE_ID, "%u", d->module->global->id);
client = pw_context_create_client(s->this.core,
protocol, props, sizeof(struct client_data));

6
src/modules/module-session-manager/client-endpoint/client-endpoint.c
View file

@ -166,9 +166,9 @@ static void *create_object(void *data,
if (!properties)
goto no_mem;
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(owner)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(factory)->id);
this->resource = pw_resource_new(owner, new_id, PW_PERM_ALL, type, version, 0);
@ -233,7 +233,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

6
src/modules/module-session-manager/client-session/client-session.c
View file

@ -165,9 +165,9 @@ static void *create_object(void *data,
if (!properties)
goto no_mem;
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(owner)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(factory)->id);
this->resource = pw_resource_new(owner, new_id, PW_PERM_ALL, type, version, 0);
@ -232,7 +232,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

6
src/modules/module-session-manager/endpoint-link.c
View file

@ -439,9 +439,9 @@ static void *create_object(void *data,
goto error_link;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
result = link_new(pw_impl_client_get_context(client), impl_resource, properties);
@ -507,7 +507,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

6
src/modules/module-session-manager/endpoint-stream.c
View file

@ -430,9 +430,9 @@ static void *create_object(void *data,
goto error_stream;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
result = stream_new(pw_impl_client_get_context(client), impl_resource, properties);
@ -498,7 +498,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

6
src/modules/module-session-manager/endpoint.c
View file

@ -439,9 +439,9 @@ static void *create_object(void *data,
goto error_endpoint;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
result = endpoint_new(pw_impl_client_get_context(client), impl_resource, properties);
@ -507,7 +507,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

6
src/modules/module-session-manager/session.c
View file

@ -428,9 +428,9 @@ static void *create_object(void *data,
goto error_session;
}
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_impl_client_get_info(client)->id);
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_impl_factory_get_info(d->factory)->id);
result = session_new(pw_impl_client_get_context(client), impl_resource, properties);
@ -495,7 +495,7 @@ static void module_registered(void *data)
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_impl_module_get_info(module)->id);
snprintf(id, sizeof(id), "%u", pw_impl_module_get_info(module)->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));

4
src/modules/module-spa-device-factory.c
View file

@ -104,13 +104,13 @@ static void *create_object(void *_data,
if ((factory_name = strdup(str)) == NULL)
goto error_properties;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_global_get_id(pw_impl_factory_get_global(data->factory)));
client = resource ? pw_resource_get_client(resource) : NULL;
if (client) {
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_global_get_id(pw_impl_client_get_global(client)));
}

4
src/modules/module-spa-node-factory.c
View file

@ -209,14 +209,14 @@ static void *create_object(void *_data,
if (factory_name == NULL)
goto error_properties;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%u",
pw_global_get_id(pw_impl_factory_get_global(data->factory)));
linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false);
client = resource ? pw_resource_get_client(resource) : NULL;
if (client && !linger) {
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%u",
pw_global_get_id(pw_impl_client_get_global(client)));
}

2
src/pipewire/impl-client.c
View file

@ -557,7 +557,7 @@ int pw_impl_client_register(struct pw_impl_client *client,
client->registered = true;
client->info.id = client->global->id;
pw_properties_setf(client->properties, PW_KEY_OBJECT_ID, "%d", client->info.id);
pw_properties_setf(client->properties, PW_KEY_OBJECT_ID, "%u", client->info.id);
pw_properties_setf(client->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(client->global));
pw_global_add_listener(client->global, &client->global_listener, &global_events, client);

2
src/pipewire/impl-core.c
View file

@ -600,7 +600,7 @@ int pw_impl_core_register(struct pw_impl_core *core,
core->registered = true;
core->info.id = core->global->id;
pw_properties_setf(core->properties, PW_KEY_OBJECT_ID, "%d", core->info.id);
pw_properties_setf(core->properties, PW_KEY_OBJECT_ID, "%u", core->info.id);
pw_properties_setf(core->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(core->global));

2
src/pipewire/impl-device.c
View file

@ -612,7 +612,7 @@ int pw_impl_device_register(struct pw_impl_device *device,
device->registered = true;
device->info.id = device->global->id;
pw_properties_setf(device->properties, PW_KEY_OBJECT_ID, "%d", device->info.id);
pw_properties_setf(device->properties, PW_KEY_OBJECT_ID, "%u", device->info.id);
pw_properties_setf(device->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(device->global));

2
src/pipewire/impl-factory.c
View file

@ -185,7 +185,7 @@ int pw_impl_factory_register(struct pw_impl_factory *factory,
factory->registered = true;
factory->info.id = factory->global->id;
pw_properties_setf(factory->properties, PW_KEY_OBJECT_ID, "%d", factory->info.id);
pw_properties_setf(factory->properties, PW_KEY_OBJECT_ID, "%u", factory->info.id);
pw_properties_setf(factory->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(factory->global));
pw_properties_set(factory->properties, PW_KEY_FACTORY_NAME, factory->info.name);

2
src/pipewire/impl-link.c
View file

@ -1687,7 +1687,7 @@ int pw_impl_link_register(struct pw_impl_link *link,
link->registered = true;
link->info.id = link->global->id;
pw_properties_setf(link->properties, PW_KEY_OBJECT_ID, "%d", link->info.id);
pw_properties_setf(link->properties, PW_KEY_OBJECT_ID, "%u", link->info.id);
pw_properties_setf(link->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(link->global));
pw_properties_setf(link->properties, PW_KEY_LINK_OUTPUT_NODE, "%u", link->info.output_node_id);

2
src/pipewire/impl-module.c
View file

@ -235,7 +235,7 @@ pw_context_load_module(struct pw_context *context,
goto error_no_global;
this->info.id = this->global->id;
pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->info.id);
pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%u", this->info.id);
pw_properties_setf(this->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));

2
src/pipewire/impl-node.c
View file

@ -988,7 +988,7 @@ int pw_impl_node_register(struct pw_impl_node *this,
this->from_driver_peer = pw_node_peer_ref(this, this);
this->to_driver_peer = pw_node_peer_ref(this, this);
pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%d", this->global->id);
pw_properties_setf(this->properties, PW_KEY_OBJECT_ID, "%u", this->global->id);
pw_properties_setf(this->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(this->global));

4
src/pipewire/impl-port.c
View file

@ -1395,8 +1395,8 @@ int pw_impl_port_register(struct pw_impl_port *port,
pw_global_add_listener(port->global, &port->global_listener, &global_events, port);
port->info.id = port->global->id;
pw_properties_setf(port->properties, PW_KEY_NODE_ID, "%d", node->global->id);
pw_properties_setf(port->properties, PW_KEY_OBJECT_ID, "%d", port->info.id);
pw_properties_setf(port->properties, PW_KEY_NODE_ID, "%u", node->global->id);
pw_properties_setf(port->properties, PW_KEY_OBJECT_ID, "%u", port->info.id);
pw_properties_setf(port->properties, PW_KEY_OBJECT_SERIAL, "%"PRIu64,
pw_global_get_serial(port->global));

4
src/tools/pw-cli.c
View file

@ -1760,8 +1760,8 @@ static bool do_create_link(struct data *data, const char *cmd, char *args, char
if (!global_port_out || !global_port_in)
continue;
pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%d", global_port_out->id);
pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%d", global_port_in->id);
pw_properties_setf(props, PW_KEY_LINK_OUTPUT_PORT, "%u", global_port_out->id);
pw_properties_setf(props, PW_KEY_LINK_INPUT_PORT, "%u", global_port_in->id);
create_link_with_properties(data, props);
}