Merge pull request #2154 from rex4539/uninitvar

fix uninitialized variable block.tunnelID
2025-03-10 19:38:28 +01:00 · 2025-02-11 08:30:28 -05:00 · 2025-02-11 08:30:28 -05:00 · ea55215668
commit ea55215668
parent 58a86fa2dc ff0b6a6a6a
1 changed files with 9 additions and 3 deletions
--- a/libi2pd/Tunnel.cpp
+++ b/libi2pd/Tunnel.cpp
@ -315,21 +315,27 @@ namespace tunnel
 	void OutboundTunnel::SendTunnelDataMsgTo (const uint8_t * gwHash, uint32_t gwTunnel, std::shared_ptr<i2p::I2NPMessage> msg)
 	{
 		TunnelMessageBlock block;
+		block.tunnelID = 0; // Initialize tunnelID to a default value
+	
 		if (gwHash)
 		{
 			block.hash = gwHash;
 			if (gwTunnel)
 			{
 				block.deliveryType = eDeliveryTypeTunnel;
-				block.tunnelID = gwTunnel;
+				block.tunnelID = gwTunnel; // Set tunnelID only if gwTunnel is non-zero
 			}
 			else
+			{
 				block.deliveryType = eDeliveryTypeRouter;
 			}
+		}
 		else
+		{
 			block.deliveryType = eDeliveryTypeLocal;
-		block.data = msg;
+		}
 	
+		block.data = msg;
 		SendTunnelDataMsgs({block});
 	}