fix(Environment): Possibility of memory leak in Windows Environment nodeIdImpl? #3823

aleks-f · aleks-f · commit d11e48f85151 · 2022-10-06T21:19:04.000+02:00
diff --git a/Foundation/src/Environment_WIN32U.cpp b/Foundation/src/Environment_WIN32U.cpp
@@ -216,7 +216,8 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
 	}
 	else if (rc != ERROR_SUCCESS)
 	{
-		return;
+		delete[] reinterpret_cast<char*>(pAdapterInfo);
+		throw SystemException("cannot get network adapter list");
 	}
 	if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR)
 	{
diff --git a/Foundation/src/Environment_WINCE.cpp b/Foundation/src/Environment_WINCE.cpp
@@ -167,6 +167,7 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
 	}
 	else if (rc != ERROR_SUCCESS)
 	{
+		delete[] reinterpret_cast<char*>(pAdapterInfo);
 		throw SystemException("cannot get network adapter list");
 	}
 	try

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,8 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)`
`216`	`216`	`}`
`217`	`217`	`else if (rc != ERROR_SUCCESS)`
`218`	`218`	`{`
`219`		`- return;`
	`219`	`+ delete[] reinterpret_cast<char*>(pAdapterInfo);`
	`220`	`+ throw SystemException("cannot get network adapter list");`
`220`	`221`	`}`
`221`	`222`	`if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR)`
`222`	`223`	`{`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)`
`167`	`167`	`}`
`168`	`168`	`else if (rc != ERROR_SUCCESS)`
`169`	`169`	`{`
	`170`	`+ delete[] reinterpret_cast<char*>(pAdapterInfo);`
`170`	`171`	`throw SystemException("cannot get network adapter list");`
`171`	`172`	`}`
`172`	`173`	`try`