MdeModulePkg/DxeCore: invoke the emulator protocol for foreign images

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6ConfigNv.c

diff --git a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
index eaeb44b2a1cf803c6db3c8b494a8ce4af070db85..aac665d3d427a8967e9a166648052bfba2d4943c 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
+++ b/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
@@ -1,15 +1,9 @@
 /** @file\r
   Helper functions for configuring or obtaining the parameters relating to IP6.\r
 \r
-  Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -600,6 +594,7 @@ Ip6ParseAddressListFromString (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
+  ZeroMem (&AddressInfo, sizeof (EFI_IP6_ADDRESS_INFO));\r
   LocalString = (CHAR16 *) AllocateCopyPool (StrSize (String), String);\r
   if (LocalString == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -717,9 +712,9 @@ Ip6ConvertInterfaceInfoToString (
   // Print the interface type.\r
   //\r
   if (IfInfo->IfType == Ip6InterfaceTypeEthernet) {\r
-    StrCpy (PortString, IP6_ETHERNET);\r
+    CopyMem (PortString, IP6_ETHERNET, sizeof (IP6_ETHERNET));\r
   } else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) {\r
-    StrCpy (PortString, IP6_EXPERIMENTAL_ETHERNET);\r
+    CopyMem (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (IP6_EXPERIMENTAL_ETHERNET));\r
   } else {\r
     //\r
     // Refer to RFC1700, chapter Number Hardware Type.\r
@@ -746,9 +741,9 @@ Ip6ConvertInterfaceInfoToString (
   for (Index = 0; Index < IfInfo->HwAddressSize; Index++) {\r
 \r
     if (IfInfo->HwAddress.Addr[Index] < 0x10) {\r
-      StrCpy (FormatString, L"0%x-");\r
+      CopyMem (FormatString, L"0%x-", sizeof (L"0%x-"));\r
     } else {\r
-      StrCpy (FormatString, L"%x-");\r
+      CopyMem (FormatString, L"%x-", sizeof (L"%x-"));\r
     }\r
 \r
     Number = UnicodeSPrint (\r
@@ -993,7 +988,7 @@ Exit:
 \r
 /**\r
   Convert IFR data into IP6 configuration data. The policy, alternative interface\r
-  ID, and DAD transmit counts, and will be saved. \r
+  ID, and DAD transmit counts, and will be saved.\r
 \r
   @param[in]       IfrNvData       The IFR NV data.\r
   @param[in, out]  Instance        The IP6 config instance data.\r
@@ -1540,7 +1535,7 @@ Ip6GetCurrentSetting (
   EFI_STATUS                    Status;\r
   CHAR16                        PortString[ADDRESS_STR_MAX_SIZE];\r
   EFI_IP6_CONFIG_INTERFACE_INFO *IfInfo;\r
-  \r
+\r
 \r
   Ip6Config = &Instance->Ip6Config;\r
   HiiHandle = Instance->CallbackInfo.RegisteredHandle;\r
@@ -1793,7 +1788,7 @@ Ip6FormCallback (
       }\r
       *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
       break;\r
-    \r
+\r
     case KEY_INTERFACE_ID:\r
       Status = Ip6ParseInterfaceIdFromString (IfrNvData->InterfaceId, &Ip6NvData->InterfaceId);\r
       if (EFI_ERROR (Status)) {\r
@@ -1804,9 +1799,9 @@ Ip6FormCallback (
           NULL\r
           );\r
       }\r
-    \r
+\r
       break;\r
-    \r
+\r
     case KEY_MANUAL_ADDRESS:\r
       Status = Ip6ParseAddressListFromString (\r
                  IfrNvData->ManualAddress,\r
@@ -1821,9 +1816,9 @@ Ip6FormCallback (
           NULL\r
           );\r
       }\r
-    \r
+\r
       break;\r
-    \r
+\r
     case KEY_GATEWAY_ADDRESS:\r
       Status = Ip6ParseAddressListFromString (\r
                  IfrNvData->GatewayAddress,\r
@@ -1838,9 +1833,9 @@ Ip6FormCallback (
           NULL\r
           );\r
       }\r
-    \r
+\r
       break;\r
-    \r
+\r
     case KEY_DNS_ADDRESS:\r
       Status = Ip6ParseAddressListFromString (\r
                  IfrNvData->DnsAddress,\r
@@ -1855,7 +1850,7 @@ Ip6FormCallback (
           NULL\r
           );\r
       }\r
-    \r
+\r
       break;\r
 \r
     default:\r