From a4182f5d0d746a999a53d55b304b3e98d4536536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 12 Apr 2020 04:15:48 +0200 Subject: [PATCH] pulse: fix pa_proplist_set[fs] usage pa_proplist_setf should be used only with an actual format string, otherwise pa_proplist_sets should be used. If the value doesn't contain any %-sequence, the result is the same, but gcc -Werror=format-security complains about format string being non-literal. This is the case for Ubuntu bionic build. Change it to pa_proplist_sets. Fixes QubesOS/qubes-issues#5766 (cherry picked from commit b9ccb2f10b33c87c2796e86931e7805674b51ecd) --- pulse/module-vchan-sink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulse/module-vchan-sink.c b/pulse/module-vchan-sink.c index 3a41e006..cafe2a59 100644 --- a/pulse/module-vchan-sink.c +++ b/pulse/module-vchan-sink.c @@ -710,7 +710,7 @@ int pa__init(pa_module * m) DEFAULT_SINK_NAME)); pa_proplist_sets(data_sink.proplist, PA_PROP_DEVICE_STRING, DEFAULT_SINK_NAME); - pa_proplist_setf(data_sink.proplist, + pa_proplist_sets(data_sink.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "sink_desc", @@ -755,7 +755,7 @@ int pa__init(pa_module * m) data_source.module = m; pa_source_new_data_set_name(&data_source, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); pa_proplist_sets(data_source.proplist, PA_PROP_DEVICE_STRING, DEFAULT_SOURCE_NAME); - pa_proplist_setf(data_source.proplist, PA_PROP_DEVICE_DESCRIPTION, + pa_proplist_sets(data_source.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "source_desc", DEFAULT_SOURCE_DESC)); pa_source_new_data_set_sample_spec(&data_source, &ss); pa_source_new_data_set_channel_map(&data_source, &map);