Fix some code analysis warnings for Packet.dll

ming-hai · Feb 21, 2018 · d6f9fba · d6f9fba
1 parent 67ab009
commit d6f9fba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/packetWin7/Dll/AdInfo.cpp b/packetWin7/Dll/AdInfo.cpp
@@ -312,6 +312,7 @@ static BOOLEAN PacketGetAddressesFromRegistry(LPCSTR AdapterNameA, PNPF_IF_ADDRE
 			RegCloseKey(UnderTcpKey);
 			goto fail;
 		}
+		RegCloseKey(UnderTcpKey);
 	}
 	else
 	{
@@ -322,21 +323,18 @@ static BOOLEAN PacketGetAddressesFromRegistry(LPCSTR AdapterNameA, PNPF_IF_ADDRE
 		status = RegOpenKeyEx(SystemKey,IfNameW,0,KEY_READ,&InterfaceKey);
 		if (status != ERROR_SUCCESS) {
 			RegCloseKey(SystemKey);
-			RegCloseKey(UnderTcpKey);
 			goto fail;
 		}
 		RegCloseKey(SystemKey);
 		status = RegOpenKeyEx(InterfaceKey,TEXT("Parameters"),0,KEY_READ,&ParametersKey);
 		if (status != ERROR_SUCCESS) {
 			RegCloseKey(InterfaceKey);
-			RegCloseKey(UnderTcpKey);
 			goto fail;
 		}
 		RegCloseKey(InterfaceKey);
 		status = RegOpenKeyEx(ParametersKey,TEXT("TcpIp"),0,KEY_READ,&TcpIpKey);
 		if (status != ERROR_SUCCESS) {
 			RegCloseKey(ParametersKey);
-			RegCloseKey(UnderTcpKey);
 			goto fail;
 		}
 		RegCloseKey(ParametersKey);

diff --git a/packetWin7/Dll/Packet32.cpp b/packetWin7/Dll/Packet32.cpp
@@ -407,7 +407,7 @@ HMODULE LoadLibrarySafe(LPCTSTR lpFileName)
   {
 	res = GetSystemDirectory(path, MAX_PATH);
 
-	if (res == 0)
+	if (res == 0 || !path)
 	{
 		//
 		// some bad failure occurred;