Fixed array bounds overflow in modified code

3 files changed, 3 insertions, 4 deletions

diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
index 63268c44..58c9da14 100644
--- a/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
+++ b/src/Networking/LwipEthernet/LwipEthernetInterface.cpp
@@ -146,9 +146,9 @@ void LwipEthernetInterface::Init() noexcept
 	lwipMutex.Create("LwipCore");
 
 	// Clear the PCBs
-	for (size_t i = 0; i < NumTcpPorts; ++i)
+	for (tcp_pcb*& pcb : listeningPcbs)
 	{
-		listeningPcbs[i] = nullptr;
+		pcb = nullptr;
 	}
 
 	macAddress = platform.GetDefaultMacAddress();
diff --git a/src/Networking/LwipEthernet/LwipEthernetInterface.h b/src/Networking/LwipEthernet/LwipEthernetInterface.h
index 01fa0f03..12c2bc08 100644
--- a/src/Networking/LwipEthernet/LwipEthernetInterface.h
+++ b/src/Networking/LwipEthernet/LwipEthernetInterface.h
@@ -87,7 +87,7 @@ private:
 	TcpPort portNumbers[NumProtocols];				// port number used for each protocol
 	bool protocolEnabled[NumProtocols];				// whether each protocol is enabled
 	bool closeDataPort;
-	tcp_pcb *listeningPcbs[NumTcpPorts];
+	tcp_pcb *listeningPcbs[NumProtocols + 1];
 
 	bool activated;
 	bool initialised;
diff --git a/src/Networking/NetworkDefs.h b/src/Networking/NetworkDefs.h
index 2ef74aa4..d1f17b9e 100644
--- a/src/Networking/NetworkDefs.h
+++ b/src/Networking/NetworkDefs.h
@@ -46,7 +46,6 @@ constexpr size_t NumProtocols = NumTcpProtocols;		// number of network protocols
 
 constexpr NetworkProtocol HttpProtocol = 0, FtpProtocol = 1, TelnetProtocol = 2, MulticastDiscoveryProtocol = 3, FtpDataProtocol = 3, MdnsProtocol = 4, AnyProtocol = 255;
 
-constexpr size_t NumTcpPorts = NumTcpProtocols + 1;
 constexpr TcpPort DefaultHttpPort = 80;
 constexpr TcpPort DefaultFtpPort = 21;
 constexpr TcpPort DefaultTelnetPort = 23;