stream: fix assert logic for signature length

signature length is uint8 so checking for length < 256
will always assert true. This also currects logic when
serializing std::string::length() might have different
size than uint8

2 files changed, 6 insertions, 5 deletions

diff --git a/src/CommonAPI/DBus/DBusInputStream.h b/src/CommonAPI/DBus/DBusInputStream.h
index f09be98..fb190c9 100644
--- a/src/CommonAPI/DBus/DBusInputStream.h
+++ b/src/CommonAPI/DBus/DBusInputStream.h
@@ -206,7 +206,6 @@ class DBusInputStream: public InputStream {
     inline void skipOverSignature() {
         uint8_t signatureLength;
         readValue(signatureLength);
-        assert(signatureLength < 256);
         readRawData(signatureLength + 1);
     }
 
diff --git a/src/CommonAPI/DBus/DBusOutputStream.cpp b/src/CommonAPI/DBus/DBusOutputStream.cpp
index cf84fe8..701a628 100644
--- a/src/CommonAPI/DBus/DBusOutputStream.cpp
+++ b/src/CommonAPI/DBus/DBusOutputStream.cpp
@@ -308,10 +308,12 @@ void DBusOutputStream::beginWriteGenericVector() {
 }
 
 void DBusOutputStream::writeSignature(const std::string& signature) {
-    uint8_t length = (uint8_t) signature.length();
-    assert(length < 256);
-    *this << length;
-    writeRawData(signature.c_str(), length + 1);
+	const auto& signatureLength = signature.length();
+	assert(signatureLength > 0 && signatureLength < 256);
+
+	const uint8_t wireLength = (uint8_t) signatureLength;
+    *this << wireLength;
+    writeRawData(signature.c_str(), wireLength + 1);
 }
 
 void DBusOutputStream::rememberCurrentStreamPosition() {