Merge remote-tracking branch 'origin/master' into enhanced_device

2018-12-02 11:29:29 +01:00
parent da3e674dd2 b608d80916
commit 23bab07ea0
6 changed files with 81 additions and 34 deletions
@@ -249,7 +249,7 @@ class SymbolString {
    } else if (m_data.size() >= lengthOffset+255) {
      return false;
    }
-    m_data[lengthOffset] = (symbol_t)(m_data.size() - 1 - lengthOffset);
+    m_data[lengthOffset] = (symbol_t)(m_data.size() - lengthOffset - 1);
    return true;
  }

@@ -272,6 +272,18 @@ class SymbolString {
    return m_data.size() < lengthOffset + 1 + ret ? m_data.size() - lengthOffset - 1 : ret;
  }

+  /**
+   * Return the calculated number of data bytes DD (nnot yet revealed in the length field).
+   * @return the calculated number of data bytes DD.
+   */
+  size_t getCalculatedDataSize() const {
+    size_t lengthOffset = (m_isMaster ? 4 : 0);
+    if (m_data.size() <= lengthOffset) {
+      return 0;
+    }
+    return m_data.size() - lengthOffset - 1;
+  }
+
  /**
   * Return the data byte at the specified index (within DD).
   * @param index the index of the data byte (within DD) to return.