mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol-native: check invariant for marshaled data

Browse source 
There's an assumption that marshaled messages consist of a single POD,
since we now tag on a footer after it.  This is true for the
protocol-native implementations, which all wrap the message in a single
POD Struct.

To catch protocol-native implementation bugs here later, add assert that
marshaling produces a single POD.
This commit is contained in:
Pauli Virtanen 2022-02-20 18:13:22 +02:00
parent d44bf0ffc0
commit bf9ef440c3
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1277,11 +1277,24 @@ static int impl_ext_get_proxy_fd(struct pw_proxy *proxy, uint32_t index)
return pw_protocol_native_connection_get_fd(impl->connection, index); return pw_protocol_native_connection_get_fd(impl->connection, index);
} }
static void assert_single_pod(struct spa_pod_builder *builder)
{
/*
* Check the invariant that the message we just marshaled
* consists of at most one POD.
*/
struct spa_pod *pod = builder->data;
spa_assert(builder->data == NULL ||
builder->state.offset < sizeof(struct spa_pod) ||
builder->state.offset == SPA_POD_SIZE(pod));
}
static int impl_ext_end_proxy(struct pw_proxy *proxy, static int impl_ext_end_proxy(struct pw_proxy *proxy,
struct spa_pod_builder *builder) struct spa_pod_builder *builder)
{ {
struct pw_core *core = proxy->core; struct pw_core *core = proxy->core;
struct client *impl = SPA_CONTAINER_OF(core->conn, struct client, this); struct client *impl = SPA_CONTAINER_OF(core->conn, struct client, this);
assert_single_pod(builder);
marshal_proxy_footers(&impl->footer_state, proxy, builder); marshal_proxy_footers(&impl->footer_state, proxy, builder);
return core->send_seq = pw_protocol_native_connection_end(impl->connection, builder); return core->send_seq = pw_protocol_native_connection_end(impl->connection, builder);
} }
@ -1310,6 +1323,7 @@ static int impl_ext_end_resource(struct pw_resource *resource,
{ {
struct client_data *data = resource->client->user_data; struct client_data *data = resource->client->user_data;
struct pw_impl_client *client = resource->client; struct pw_impl_client *client = resource->client;
assert_single_pod(builder);
marshal_resource_footers(&data->footer_state, resource, builder); marshal_resource_footers(&data->footer_state, resource, builder);
return client->send_seq = pw_protocol_native_connection_end(data->connection, builder); return client->send_seq = pw_protocol_native_connection_end(data->connection, builder);
} }