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

audioconvert: use sizeof for position size

Browse source 
And make the position field a little larger
This commit is contained in:
Wim Taymans 2021-02-16 15:07:40 +01:00
parent 0061ddd6be
commit ca10c6470f
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spa/plugins/audioconvert/merger.c
View file

@ -209,12 +209,13 @@ static int init_port(struct impl *this, enum spa_direction direction, uint32_t p
port->id = port_id; port->id = port_id;
if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) { if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) {
snprintf(port->position, 16, "%s", snprintf(port->position, sizeof(port->position), "%s",
spa_debug_type_short_name(spa_type_audio_channel[position].name)); spa_debug_type_short_name(spa_type_audio_channel[position].name));
} else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) { } else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) {
snprintf(port->position, 16, "AUX%d", position - SPA_AUDIO_CHANNEL_CUSTOM_START); snprintf(port->position, sizeof(port->position), "AUX%d",
position - SPA_AUDIO_CHANNEL_CUSTOM_START);
} else { } else {
snprintf(port->position, 16, "UNK"); snprintf(port->position, sizeof(port->position), "UNK");
} }
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |

9
spa/plugins/audioconvert/splitter.c
View file

@ -76,7 +76,7 @@ struct port {
struct spa_dict info_props; struct spa_dict info_props;
struct spa_dict_item info_props_items[2]; struct spa_dict_item info_props_items[2];
char position[8]; char position[16];
bool have_format; bool have_format;
struct spa_audio_info format; struct spa_audio_info format;
@ -158,12 +158,13 @@ static int init_port(struct impl *this, enum spa_direction direction,
port->id = port_id; port->id = port_id;
if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) { if (position < SPA_N_ELEMENTS(spa_type_audio_channel)) {
snprintf(port->position, 7, "%s", snprintf(port->position, sizeof(port->position), "%s",
spa_debug_type_short_name(spa_type_audio_channel[position].name)); spa_debug_type_short_name(spa_type_audio_channel[position].name));
} else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) { } else if (position >= SPA_AUDIO_CHANNEL_CUSTOM_START) {
snprintf(port->position, 7, "AUX%d", position - SPA_AUDIO_CHANNEL_CUSTOM_START); snprintf(port->position, sizeof(port->position), "AUX%d",
position - SPA_AUDIO_CHANNEL_CUSTOM_START);
} else { } else {
snprintf(port->position, 7, "UNK"); snprintf(port->position, sizeof(port->position), "UNK");
} }
port->info_all = SPA_PORT_CHANGE_MASK_FLAGS | port->info_all = SPA_PORT_CHANGE_MASK_FLAGS |