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

pulse-server: use safer spa_scnprintf

Browse source 
This clamps to the max size of the input buffer so that we don't write
the next item past the allocated space.
This commit is contained in:
Wim Taymans 2021-12-22 21:34:29 +01:00
parent 2905635de3
commit 3de9d3df3b
8 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/module-protocol-pulse/modules/module-ladspa-sink.c
View file

@ -162,7 +162,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-ladspa-source.c
View file

@ -162,7 +162,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-null-sink.c
View file

@ -179,7 +179,7 @@ struct module *create_module_null_sink(struct impl *impl, const char *argument)
p = s = alloca(info.channels * 8); p = s = alloca(info.channels * 8);
for (i = 0; i < info.channels; i++) for (i = 0; i < info.channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info.position[i])); channel_id2name(info.position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-remap-sink.c
View file

@ -141,7 +141,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-remap-source.c
View file

@ -141,7 +141,7 @@ static void position_to_props(struct spa_audio_info_raw *info, struct pw_propert
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-tunnel-sink.c
View file

@ -146,7 +146,7 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

2
src/modules/module-protocol-pulse/modules/module-tunnel-source.c
View file

@ -146,7 +146,7 @@ static void audio_info_to_props(struct spa_audio_info_raw *info, struct pw_prope
pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels); pw_properties_setf(props, SPA_KEY_AUDIO_CHANNELS, "%u", info->channels);
p = s = alloca(info->channels * 8); p = s = alloca(info->channels * 8);
for (i = 0; i < info->channels; i++) for (i = 0; i < info->channels; i++)
p += snprintf(p, 8, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(info->position[i])); channel_id2name(info->position[i]));
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }

8
src/modules/module-zeroconf-discover.c
View file

@ -209,12 +209,12 @@ static void pw_properties_from_avahi_string(const char *key, const char *value,
channel_map_parse(value, &channel_map); channel_map_parse(value, &channel_map);
channel_map_to_positions(&channel_map, pos); channel_map_to_positions(&channel_map, pos);
p = s = alloca(4 + channel_map.channels * 6); p = s = alloca(4 + channel_map.channels * 8);
p += snprintf(p, 6, "["); p += spa_scnprintf(p, 2, "[");
for (i = 0; i < channel_map.channels; i++) for (i = 0; i < channel_map.channels; i++)
p += snprintf(p, 6, "%s%s", i == 0 ? "" : ",", p += spa_scnprintf(p, 8, "%s%s", i == 0 ? "" : ",",
channel_id2name(pos[i])); channel_id2name(pos[i]));
p += snprintf(p, 6, "]"); p += spa_scnprintf(p, 2, "]");
pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s); pw_properties_set(props, SPA_KEY_AUDIO_POSITION, s);
} }
else if (spa_streq(key, "format")) { else if (spa_streq(key, "format")) {