ensure packed strings are always null-terminated

1 files changed, 4 insertions, 0 deletions

diff --git a/daemon/packer.cpp b/daemon/packer.cpp
index 4dabf96..0cc71f6 100644
--- a/daemon/packer.cpp
+++ b/daemon/packer.cpp
@@ -97,6 +97,10 @@ void Packer::writeDict(const QMap<int, QVariant> &d)
         case QMetaType::QUrl:
         {
             QByteArray s = it.value().toString().toUtf8();
+            if (s.isEmpty() || s[s.size() - 1] != '\0') {
+                // Add null terminator if it doesn't have one
+                s.append('\0');
+            }
             writeLE<quint8>(WatchConnector::typeSTRING);
             writeLE<quint16>(s.size());
             _buf->append(s);