X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=NetworkPkg%2FIp6Dxe%2FIp6ConfigNv.c;h=aac665d3d427a8967e9a166648052bfba2d4943c;hb=57df17fe26cd2b25c4c463edf3a3d8b83263f51b;hp=eaeb44b2a1cf803c6db3c8b494a8ce4af070db85;hpb=e464225ca65b80fcd96b6a02121d2944d58fd444;p=mirror_edk2.git

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