Merge pull request #2223 from synqa/fix-memory-leak-loadlanglist

Fix memory leak in LoadLangList()

.gitignore

@@ -210,5 +210,3 @@ developer_tools/stbchecker/**/*.binlog
 developer_tools/stbchecker/**/*.nvuser
 developer_tools/stbchecker/**/.mfractor/
 /vcpkg_installed
-_codeql_build_dir/
-_codeql_detected_source_root

src/Cedar/Virtual.c

@@ -1190,67 +1190,6 @@ void NnIpSendForInternet(NATIVE_NAT *t, UCHAR ip_protocol, UCHAR ttl, UINT src_i
 	}
 }
 
-// Host IP address cache TTL in milliseconds (60 seconds)
-#define HOST_IP_CACHE_TTL_MS		60000
-
-// Check if destination IP is one of the host's own IP addresses
-// Uses caching to avoid frequent system calls
-// Returns true if dest_ip matches any of the host's IPs
-bool IsDestinationHostOwnIP(VH *v, UINT dest_ip)
-{
-	bool is_host_ip = false;
-	UINT64 now;
-	LIST *new_list = NULL;
-	// Validate arguments
-	if (v == NULL)
-	{
-		return false;
-	}
-
-	now = Tick64();
-
-	Lock(v->HostIPCacheLock);
-	{
-		// Check if cache needs refresh (every 60 seconds or if not initialized)
-		if (v->HostIPAddressCache == NULL || now >= v->HostIPCacheExpires)
-		{
-			// Get new list while holding the lock to prevent multiple threads from refreshing
-			new_list = GetHostIPAddressList();
-			
-			// Free old cache
-			if (v->HostIPAddressCache != NULL)
-			{
-				FreeHostIPAddressList(v->HostIPAddressCache);
-			}
-			
-			// Set new cache with TTL
-			v->HostIPAddressCache = new_list;
-			v->HostIPCacheExpires = now + HOST_IP_CACHE_TTL_MS;
-		}
-
-		// Check if dest_ip matches any cached host IP
-		if (v->HostIPAddressCache != NULL)
-		{
-			UINT i;
-			IP dest_ip_obj;
-			UINTToIP(&dest_ip_obj, dest_ip);
-			
-			for (i = 0; i < LIST_NUM(v->HostIPAddressCache); i++)
-			{
-				IP *host_ip = LIST_DATA(v->HostIPAddressCache, i);
-				if (IsIP4(host_ip) && CmpIpAddr(&dest_ip_obj, host_ip) == 0)
-				{
-					is_host_ip = true;
-					break;
-				}
-			}
-		}
-	}
-	Unlock(v->HostIPCacheLock);
-
-	return is_host_ip;
-}
-
 // Communication of ICMP towards the Internet
 void NnIcmpEchoRecvForInternet(VH *v, UINT src_ip, UINT dest_ip, void *data, UINT size, UCHAR ttl, void *icmp_data, UINT icmp_size, UCHAR *ip_header, UINT ip_header_size, UINT max_l3_size)
 {
@@ -1270,15 +1209,6 @@ void NnIcmpEchoRecvForInternet(VH *v, UINT src_ip, UINT dest_ip, void *data, UIN
 		return;
 	}
 
-	// Check if destination is the host's own IP address
-	// When Native NAT tries to send packets to the host's own IP, the OS routing
-	// may fail or behave unexpectedly. Drop such packets to avoid issues.
-	if (IsDestinationHostOwnIP(v, dest_ip))
-	{
-		// Destination is the host's own IP - drop the packet
-		return;
-	}
-
 	t = v->NativeNat;
 
 	old_icmp_header = (ICMP_HEADER *)icmp_data;
@@ -1421,15 +1351,6 @@ void NnUdpRecvForInternet(VH *v, UINT src_ip, UINT src_port, UINT dest_ip, UINT
 		return;
 	}
 
-	// Check if destination is the host's own IP address
-	// When Native NAT tries to send packets to the host's own IP, the OS routing
-	// may fail or behave unexpectedly. Drop such packets to avoid issues.
-	if (IsDestinationHostOwnIP(v, dest_ip))
-	{
-		// Destination is the host's own IP - drop the packet
-		return;
-	}
-
 	t = v->NativeNat;
 
 	// Search whether there is an existing session
@@ -1528,15 +1449,6 @@ void NnTcpRecvForInternet(VH *v, UINT src_ip, UINT src_port, UINT dest_ip, UINT
 		return;
 	}
 
-	// Check if destination is the host's own IP address
-	// When Native NAT tries to send packets to the host's own IP, the OS routing
-	// may fail or behave unexpectedly. Drop such packets to avoid issues.
-	if (IsDestinationHostOwnIP(v, dest_ip))
-	{
-		// Destination is the host's own IP - drop the packet
-		return;
-	}
-
 	t = v->NativeNat;
 
 	// Search whether there is an existing session
@@ -10281,13 +10193,6 @@ void Virtual_Free(VH *v)
 
 	LockVirtual(v);
 	{
-		// Free host IP cache
-		if (v->HostIPAddressCache != NULL)
-		{
-			FreeHostIPAddressList(v->HostIPAddressCache);
-			v->HostIPAddressCache = NULL;
-		}
-
 		// Release the IP combining list
 		FreeIpCombineList(v);
 
@@ -10322,9 +10227,6 @@ void Virtual_Free(VH *v)
 	}
 	UnlockVirtual(v);
 
-	// Release the host IP cache lock
-	DeleteLock(v->HostIPCacheLock);
-
 	// Release the logger
 	FreeLog(v->Logger);
 }
@@ -10455,11 +10357,6 @@ VH *NewVirtualHostEx(CEDAR *cedar, CLIENT_OPTION *option, CLIENT_AUTH *auth, VH_
 
 	v->nat = nat;
 
-	// Initialize host IP cache for Native NAT
-	v->HostIPAddressCache = NULL;
-	v->HostIPCacheExpires = 0;
-	v->HostIPCacheLock = NewLock();
-
 	// Examine whether ICMP Raw Socket can be created
 	s = NewUDP4(MAKE_SPECIAL_PORT(IP_PROTO_ICMPV4), NULL);
 	if (s != NULL)

src/Cedar/Virtual.h

@@ -313,11 +313,6 @@ struct VH
 	HUB_OPTION *HubOption;			// Pointer to the Virtual HUB options
 
 	NATIVE_NAT *NativeNat;			// Native NAT
-
-	// Host IP cache for Native NAT packet filtering
-	LIST *HostIPAddressCache;		// Cached list of host IP addresses
-	UINT64 HostIPCacheExpires;		// When the cache expires (tick64)
-	LOCK *HostIPCacheLock;			// Lock for cache access
 };
 
 // Virtual host option

src/Mayaqua/Encrypt.c

@@ -4761,7 +4761,7 @@ static void MY_SHA0_Transform(MY_SHA0_CTX* ctx) {
 	UCHAR* p = ctx->buf;
 	int t;
 	for(t = 0; t < 16; ++t) {
-		UINT tmp =  *p++ << 24;
+		UINT tmp =  (UINT)*p++ << 24;
 		tmp |= *p++ << 16;
 		tmp |= *p++ << 8;
 		tmp |= *p++;

src/Mayaqua/Kernel.c

@@ -63,7 +63,7 @@ static int ydays[] =
 	0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
 };
 
-static UINT current_num_thread = 0;
+static COUNTER *current_num_thread = NULL;
 static UINT cached_number_of_cpus = 0;
 
 
@@ -776,6 +776,7 @@ void InitThreading()
 {
 	thread_pool = NewSk();
 	thread_count = NewCounter();
+	current_num_thread = NewCounter();
 }
 
 // Release of thread pool
@@ -821,6 +822,9 @@ void FreeThreading()
 
 	DeleteCounter(thread_count);
 	thread_count = NULL;
+
+	DeleteCounter(current_num_thread);
+	current_num_thread = NULL;
 }
 
 // Thread pool procedure
@@ -1028,9 +1032,9 @@ THREAD *NewThreadNamed(THREAD_PROC *thread_proc, void *param, char *name)
 
 	Wait(pd->InitFinishEvent, INFINITE);
 
-	current_num_thread++;
+	Inc(current_num_thread);
 
-//	Debug("current_num_thread = %u\n", current_num_thread);
+//	Debug("current_num_thread = %u\n", Count(current_num_thread));
 
 	return ret;
 }
@@ -1055,8 +1059,8 @@ void CleanupThread(THREAD *t)
 
 	Free(t);
 
-	current_num_thread--;
-	//Debug("current_num_thread = %u\n", current_num_thread);
+	Dec(current_num_thread);
+	//Debug("current_num_thread = %u\n", Count(current_num_thread));
 }
 
 // Release thread (pool)

src/Mayaqua/Table.c

@@ -470,6 +470,7 @@ LIST *LoadLangList()
 	b = ReadDump(filename);
 	if (b == NULL)
 	{
+		FreeLangList(o);
 		return NULL;
 	}
 

src/Mayaqua/Tick64.c

@@ -139,6 +139,7 @@ void Tick64Thread(THREAD *thread, void *param)
 	{
 		UINT tick;
 		UINT64 tick64;
+		bool halt;
 
 #ifndef	OS_WIN32
 		tick = TickRealtime();		// Get the current system clock
@@ -228,7 +229,13 @@ void Tick64Thread(THREAD *thread, void *param)
 			n = 0;
 		}
 
-		if (tk64->Halt)
+		Lock(tk64->TickLock);
+		{
+			halt = tk64->Halt;
+		}
+		Unlock(tk64->TickLock);
+
+		if (halt)
 		{
 			break;
 		}
@@ -286,7 +293,11 @@ void FreeTick64()
 	}
 
 	// Termination process
+	Lock(tk64->TickLock);
+	{
 		tk64->Halt = true;
+	}
+	Unlock(tk64->TickLock);
 	Set(halt_tick_event);
 	WaitThread(tk64->Thread, INFINITE);
 	ReleaseThread(tk64->Thread);

src/Mayaqua/Unix.c

@@ -2140,9 +2140,13 @@ void UnixMemoryFree(void *addr)
 // SIGCHLD handler
 void UnixSigChldHandler(int sig)
 {
+	int old_errno = errno;
+
 	// Recall the zombie processes
 	while (waitpid(-1, NULL, WNOHANG) > 0);
 	signal(SIGCHLD, UnixSigChldHandler);
+
+	errno = old_errno;
 }
 
 // Disable core dump