mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: allow UTF-8 in device descriptions

Browse source 
Users may configure the device alias to have characters outside the
ASCII range, so our name cleanup routine was too aggressive. Let's just
make sure that the device description is a valid UTF-8 string.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=98160
This commit is contained in:
Tanu Kaskinen 2016-10-11 17:27:06 +03:00
parent b53dd1f0df
commit d7e85813bd
4 changed files with 4 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/bluetooth/module-bluez5-device.c
View file

@ -29,6 +29,7 @@
#include <pulse/rtclock.h>
#include <pulse/timeval.h>
#include <pulse/utf8.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-rtclock.h>
@ -1618,38 +1619,6 @@ static void stop_thread(struct userdata *u) {
}
}
/* Run from main thread */
static char *cleanup_name(const char *name) {
char *t, *s, *d;
bool space = false;
pa_assert(name);
while ((*name >= 1 && *name <= 32) || *name >= 127)
name++;
t = pa_xstrdup(name);
for (s = d = t; *s; s++) {
if (*s <= 32 || *s >= 127 || *s == '_') {
space = true;
continue;
}
if (space) {
*(d++) = ' ';
space = false;
}
*(d++) = *s;
}
*d = 0;
return t;
}
/* Run from main thread */
static pa_available_t get_port_availability(struct userdata *u, pa_direction_t direction) {
pa_available_t result = PA_AVAILABLE_NO;
@ -1944,7 +1913,7 @@ static int add_card(struct userdata *u) {
data.driver = __FILE__;
data.module = u->module;
alias = cleanup_name(d->alias);
alias = pa_utf8_filter(d->alias);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, alias);
pa_xfree(alias);