fixup DecodeEnd

project-chip · May 28, 2020 · 8df05ef · 8df05ef
1 parent 41b6517
commit 8df05ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/app/chip-zcl/chip-zcl-codec.h b/src/app/chip-zcl/chip-zcl-codec.h
@@ -79,4 +79,9 @@ ChipZclStatus_t chipZclCodecDecodeStart(ChipZclCodec_t * codec, ChipZclBuffer_t
  */
 ChipZclStatus_t chipZclCodecDecode(ChipZclCodec_t * codec, ChipZclType_t type, void * ptr, uint16_t ptrLen, uint16_t * retLen);
 
+/**
+ * @brief Call after decoding to verify that everything has been decoded
+ */
+ChipZclStatus_t chipZclCodecDecodeEnd(ChipZclCodec_t * me);
+
 #endif // CHIP_ZCL_CODEC
diff --git a/src/app/plugin/codec-simple/codec-simple.c b/src/app/plugin/codec-simple/codec-simple.c
@@ -157,12 +157,18 @@ ChipZclStatus_t chipZclCodecDecode(ChipZclCodec_t * me, ChipZclType_t type, void
 }
 
 /**
- * @brief Ends the decoding process. After this call, buffer should no longer be used for further decoding.
+ * @brief Call after decoding to verify that everything has been decoded
  */
 ChipZclStatus_t chipZclCodecDecodeEnd(ChipZclCodec_t * me)
 {
-    chipZclBufferSetDataLength(me->buffer, me->cursor);
-    return CHIP_ZCL_STATUS_SUCCESS;
+    if (chipZclBufferDataLength(me->buffer) == me->cursor)
+    {
+        return CHIP_ZCL_STATUS_SUCCESS;
+    }
+    else
+    {
+        return CHIP_ZCL_STATUS_FAILURE;
+    }
 }
 
 void chipZclEncodeZclHeader(ChipZclBuffer_t * buffer, ChipZclCommandContext_t * context)