Try to fix CI build errors

project-chip · Jan 7, 2025 · 7ecbf7b · 7ecbf7b
1 parent 267b09d
commit 7ecbf7b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/system/SystemPacketBuffer.cpp b/src/system/SystemPacketBuffer.cpp
@@ -636,6 +636,9 @@ PacketBufferHandle PacketBufferHandle::New(size_t aAvailableSize, uint16_t aRese
     lPacket->payload = lPacket->ReserveStart() + aReservedSize;
 #if CHIP_SYSTEM_PACKETBUFFER_FROM_CHIP_HEAP
     lPacket->alloc_size = lAllocSize;
+#endif
+#if !CHIP_SYSTEM_CONFIG_USE_LWIP
+    lPacket->next = nullptr;
 #endif
     // Set current packet and chained buffers' length and total length to 0
     for (PacketBuffer * pktBuf = lPacket; pktBuf != nullptr; pktBuf = pktBuf->ChainedBuffer())
@@ -664,7 +667,7 @@ PacketBufferHandle PacketBufferHandle::NewWithData(const void * aData, size_t aD
 #endif
         PacketBuffer * currentBuffer = buffer.mBuffer;
         const uint8_t * dataPtr      = static_cast<const uint8_t *>(aData);
-        while (aDataSize > 0)
+        while (currentBuffer && aDataSize > 0)
         {
             size_t copyLen = currentBuffer->MaxDataLength() > aDataSize ? aDataSize : currentBuffer->MaxDataLength();
             memcpy(currentBuffer->payload, dataPtr, copyLen);