Release v1.2.1

Author: arobenko

comms/include/comms/field/adapter/SequenceSerLengthFieldPrefix.h

@@ -95,7 +95,13 @@ class SequenceSerLengthFieldPrefix : public TBase
             return es;
         }
 
-        es = BaseImpl::read(iter, static_cast<std::size_t>(lenField.value()));
+        len -= lenField.length();
+        auto remLen = static_cast<std::size_t>(lenField.value());
+        if (len < remLen) {
+            return TStatus;
+        }
+
+        es = BaseImpl::read(iter, remLen);
         if (es == comms::ErrorStatus::NotEnoughData) {
             return TStatus;
         }

comms/include/comms/field/adapter/SequenceTerminationFieldSuffix.h

@@ -154,7 +154,7 @@ class SequenceTerminationFieldSuffix : public TBase
         std::size_t consumed = 0;
         while (consumed < len) {
             auto iterCpy = iter + consumed;
-            auto es = termField.read(iterCpy, len);
+            auto es = termField.read(iterCpy, len - consumed);
             if ((es == comms::ErrorStatus::Success) &&
                 (termField == TermField())){
                 break;
@@ -167,12 +167,15 @@ class SequenceTerminationFieldSuffix : public TBase
             return comms::ErrorStatus::NotEnoughData;
         }
 
-        auto es = BaseImpl::read(iter, consumed);
+        auto iterCpy = iter;
+        auto es = BaseImpl::read(iterCpy, consumed);
         if (es != comms::ErrorStatus::Success) {
             return es;
         }
 
-        std::advance(iter, termField.length());
+        auto fullConsumeLen = consumed + termField.length();
+        GASSERT(fullConsumeLen <= len);
+        std::advance(iter, fullConsumeLen);
         return comms::ErrorStatus::Success;
     }