NetworkPkg: Fix Duplicate FreePool Error in WCM

[mirror_edk2.git] / NetworkPkg / WifiConnectionManagerDxe / WifiConnectionMgrHiiConfigAccess.c

diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c
index bfb6b6e5caa8dcb52255cb905cc0671a2dadd7c8..d0d55f46dac2ed9a2329182e9922997d8225c79b 100644 (file)
--- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c
+++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrHiiConfigAccess.c
@@ -447,6 +447,8 @@ WifiMgrRefreshNetworkList (
       }\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
+      AKMListDisplay    = NULL;\r
+      CipherListDisplay = NULL;\r
 \r
       HiiCreateGotoOpCode (\r
         StartOpCodeHandle,\r
@@ -532,6 +534,8 @@ WifiMgrRefreshNetworkList (
       }\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
+      AKMListDisplay    = NULL;\r
+      CipherListDisplay = NULL;\r
 \r
       HiiCreateGotoOpCode (\r
         StartOpCodeHandle,\r
@@ -612,6 +616,8 @@ WifiMgrRefreshNetworkList (
       }\r
       FreePool (AKMListDisplay);\r
       FreePool (CipherListDisplay);\r
+      AKMListDisplay    = NULL;\r
+      CipherListDisplay = NULL;\r
 \r
       PortHelpToken = HiiSetString (Private->RegisteredHandle, 0, PortString, NULL);\r
 \r
@@ -1657,6 +1663,7 @@ WifiMgrDxeHiiConfigAccessCallback (
 \r
           ZeroMem (Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
           FreePool (Profile->PrivateKeyData);\r
+          Profile->PrivateKeyData = NULL;\r
         }\r
 \r
         Status = WifiMgrReadFileToBuffer (\r
@@ -1700,12 +1707,14 @@ WifiMgrDxeHiiConfigAccessCallback (
 \r
             ZeroMem (Profile->CACertData, Profile->CACertSize);\r
             FreePool (Profile->CACertData);\r
+            Profile->CACertData = NULL;\r
           }\r
         } else if (Private->FileType == FileTypeClientCert) {\r
           if (Profile->ClientCertData != NULL) {\r
 \r
             ZeroMem (Profile->ClientCertData, Profile->ClientCertSize);\r
             FreePool (Profile->ClientCertData);\r
+            Profile->ClientCertData = NULL;\r
           }\r
         } else {\r
           break;\r