More fixes to the RemLengthMemberField adapter.

commschamp · Jun 19, 2024 · 9ea82aa · 9ea82aa
1 parent fc6ee74
commit 9ea82aa
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/comms/field/adapter/RemLengthMemberField.h b/include/comms/field/adapter/RemLengthMemberField.h
@@ -363,6 +363,11 @@ class RemLengthMemberField : public TBase
 
         static const std::size_t NextIdx = (TFromIdx <= TLenFieldIdx) ? TLenFieldIdx + 1 : TFromIdx;
 
+        if ((std::tuple_size<ValueType>::value <= TUntilIdx) &&
+            (len < reqLen)) {
+            return comms::ErrorStatus::NotEnoughData;
+        }
+
         auto remLen = std::min(len, reqLen);
         es = BaseImpl::template readFromUntilAndUpdateLen<NextIdx, TUntilIdx>(iter, remLen);
         auto consumed = reqLen - remLen;