ShellPkg/UefiShellAcpiViewCommandLib: Fix ECC issues

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfig.c

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 3ce37c59e0435dcd0c9dbdc578ac309ba398a5a3..62df367da78afb23e62d729ccb5a7a1f1638ba2d 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -541,6 +541,7 @@ IScsiConvertAttemptConfigDataToIfrNvData (
     IScsiIpToStr (&Ip, FALSE, IfrNvData->SubnetMask);\r
     CopyMem (&Ip.v4, &SessionConfigData->Gateway, sizeof (EFI_IPv4_ADDRESS));\r
     IScsiIpToStr (&Ip, FALSE, IfrNvData->Gateway);\r
+    ZeroMem (IfrNvData->TargetIp, sizeof (IfrNvData->TargetIp));\r
     if (SessionConfigData->TargetIp.v4.Addr[0] != '\0') {\r
       CopyMem (&Ip.v4, &SessionConfigData->TargetIp, sizeof (EFI_IPv4_ADDRESS));\r
       IScsiIpToStr (&Ip, FALSE, IfrNvData->TargetIp);\r
@@ -3595,6 +3596,10 @@ IScsiFormCallback (
       switch (Value->u8) {\r
       case IP_MODE_IP6:\r
         NicInfo = IScsiGetNicInfoByIndex (Private->Current->NicIndex); \r
+        if(NicInfo == NULL) {\r
+          break;\r
+        }\r
+\r
         if(!NicInfo->Ipv6Available) {                  \r
              //\r
           // Current NIC doesn't Support IPv6, hence use IPv4.    \r