diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-23 13:32:05 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-23 14:05:48 +0000 |
commit | 9d3e7e9c2edb38a6bca9bb6c1cdef02c0a329ec4 (patch) | |
tree | d10d887804cd939700c5f17b95415c9100390cf2 /src/bluetooth/bluez | |
parent | 3954571fa0ebffac7f1ea2f01b9d891bbd3e83b2 (diff) |
Bluez5: Sanitize app name to be valid DBus object path name
This may happen when the app name contains for example a dash ('-').
Task-number: QTBUG-49402
Change-Id: I04b289b0723e2979a67c93e335205556bf1eb30e
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/bluez')
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper.cpp | 22 | ||||
-rw-r--r-- | src/bluetooth/bluez/bluez5_helper_p.h | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/src/bluetooth/bluez/bluez5_helper.cpp b/src/bluetooth/bluez/bluez5_helper.cpp index 384b9979..14e064e1 100644 --- a/src/bluetooth/bluez/bluez5_helper.cpp +++ b/src/bluetooth/bluez/bluez5_helper.cpp @@ -339,4 +339,26 @@ QString findAdapterForAddress(const QBluetoothAddress &wantedAddress, bool *ok = return QString(); // nothing matching found } +/* + Removes every character that cannot be used in QDbusObjectPath + + See QDbusUtil::isValidObjectPath(QString) for more details. + */ +QString sanitizeNameForDBus(const QString &text) +{ + QString appName = text; + for (int i = 0; i < appName.length(); i++) { + ushort us = appName[i].unicode(); + bool valid = (us >= 'a' && us <= 'z') + || (us >= 'A' && us <= 'Z') + || (us >= '0' && us <= '9') + || (us == '_'); + + if (!valid) + appName[i] = QLatin1Char('_'); + } + + return appName; +} + QT_END_NAMESPACE diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h index a3f164b0..019fe635 100644 --- a/src/bluetooth/bluez/bluez5_helper_p.h +++ b/src/bluetooth/bluez/bluez5_helper_p.h @@ -59,6 +59,8 @@ QT_BEGIN_NAMESPACE bool isBluez5(); +QString sanitizeNameForDBus(const QString& text); + QString findAdapterForAddress(const QBluetoothAddress &wantedAddress, bool *ok); class QtBluezDiscoveryManagerPrivate; |