address comment

project-chip · Aug 24, 2023 · c39da92 · c39da92
1 parent 03e1cd3
commit c39da92
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/controller/java/AndroidCallbacks.cpp b/src/controller/java/AndroidCallbacks.cpp
@@ -39,6 +39,8 @@ namespace Controller {
 
 static const int MILLIS_SINCE_BOOT  = 0;
 static const int MILLIS_SINCE_EPOCH = 1;
+// Add the bytes for attribute tag(1:control + 8:tag + 8:length) and structure(1:struct + 1:close container)
+static const int EXTRA_SPACE_FOR_ATTRIBUTE_TAG = 19;
 
 GetConnectedDeviceCallback::GetConnectedDeviceCallback(jobject wrapperCallback, jobject javaCallback) :
     mOnSuccess(OnDeviceConnectedFn, this), mOnFailure(OnDeviceConnectionFailureFn, this)
@@ -228,10 +230,9 @@ CHIP_ERROR ConvertReportTlvToJson(const uint32_t id, TLV::TLVReader & data, std:
 {
     TLV::TLVWriter writer;
     TLV::TLVReader readerForJavaTLV;
-    readerForJavaTLV.Init(*data);
     uint32_t size = 0;
-    // Add the bytes for attribute tag(1:control + 8:tag + 8:length) and structure(1:struct + 1:close container)
-    size_t bufferLen                  = readerForJavaTLV.GetTotalLength() + 19;
+    size_t bufferLen                  = readerForJavaTLV.GetTotalLength() + EXTRA_SPACE_FOR_ATTRIBUTE_TAG;
+    readerForJavaTLV.Init(data);
     std::unique_ptr<uint8_t[]> buffer = std::unique_ptr<uint8_t[]>(new uint8_t[bufferLen]);
     writer.Init(buffer.get(), bufferLen);
     TLV::TLVType outer;