From 66b64b75f58517e67cfe1db88261b5ba958569f3 Mon Sep 17 00:00:00 2001
From: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Date: Thu, 10 Feb 2022 08:32:21 +0100
Subject: [PATCH] Addressed review comments

---
 .../Zephyr/DiagnosticDataProviderImpl.cpp         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
index e68375b70a14c7..52126a1a5fd45b 100644
--- a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
+++ b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -214,21 +214,18 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
 
         // Assuming IPv6-only support
         Inet::InterfaceAddressIterator interfaceAddressIterator;
-        chip::Inet::IPAddress ipv6Addresses[kMaxIPv6AddrCount];
-        uint8_t ipv6AddressesCount;
-        for (ipv6AddressesCount = 0; interfaceAddressIterator.HasCurrent(); ipv6AddressesCount++)
+        uint8_t ipv6AddressesCount = 0;
+        while (interfaceAddressIterator.HasCurrent())
         {
             if (interfaceAddressIterator.GetInterfaceId() == interfaceIterator.GetInterfaceId())
             {
-                if (interfaceAddressIterator.GetAddress(ipv6Addresses[ipv6AddressesCount]) == CHIP_NO_ERROR)
+                chip::Inet::IPAddress ipv6Address;
+                if (interfaceAddressIterator.GetAddress(ipv6Address) == CHIP_NO_ERROR)
                 {
-                    memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipv6Addresses[ipv6AddressesCount].Addr, kMaxIPv6AddrSize);
+                    memcpy(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], ipv6Address.Addr, kMaxIPv6AddrSize);
                     ifp->Ipv6Addresses[ipv6AddressesCount] =
                         ByteSpan(ifp->Ipv6AddressesBuffer[ipv6AddressesCount], kMaxIPv6AddrSize);
-                }
-                else
-                {
-                    break;
+                    ipv6AddressesCount++;
                 }
             }
             interfaceAddressIterator.Next();