MdeModulePkg/Universal/Variable: Use safe string functions to refine code.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17789 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 7 insertions, 7 deletions

diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index e076840..977332e 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -3,7 +3,7 @@
   Emulation Variable services operate on the runtime volatile memory.

   The nonvolatile variable space doesn't exist.

 

-Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2015, 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

@@ -322,7 +322,7 @@ UpdateVariableInfo (
       CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);

       gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));

       ASSERT (gVariableInfo->Name != NULL);

-      StrnCpy (gVariableInfo->Name, VariableName, StrLen (VariableName));

+      StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

       gVariableInfo->Volatile = Volatile;

 

       gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);

@@ -360,7 +360,7 @@ UpdateVariableInfo (
         CopyGuid (&Entry->Next->VendorGuid, VendorGuid);

         Entry->Next->Name = AllocateZeroPool (StrSize (VariableName));

         ASSERT (Entry->Next->Name != NULL);

-        StrnCpy (Entry->Next->Name, VariableName, StrLen (VariableName));

+        StrCpyS (Entry->Next->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

         Entry->Next->Volatile = Volatile;

       }

 

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
index ab0c1d6..61de47d 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
@@ -1046,7 +1046,7 @@ InternalVarCheckVariablePropertySet (
       goto Done;

     }

     VariableName = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));

-    StrnCpy (VariableName, Name, StrLen (Name));

+    StrCpyS (VariableName, StrSize(Name)/sizeof(CHAR16), Name);

     CopyGuid (&Entry->Guid, Guid);

     CopyMem (&Entry->VariableProperty, VariableProperty, sizeof (*VariableProperty));

     InsertTailList (&mVarCheckVariableList, &Entry->Link);

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 70be71e..e1dfeea 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -158,7 +158,7 @@ UpdateVariableInfo (
       CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);

       gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));

       ASSERT (gVariableInfo->Name != NULL);

-      StrnCpy (gVariableInfo->Name, VariableName, StrLen (VariableName));

+      StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

       gVariableInfo->Volatile = Volatile;

     }

 

@@ -194,7 +194,7 @@ UpdateVariableInfo (
         CopyGuid (&Entry->Next->VendorGuid, VendorGuid);

         Entry->Next->Name = AllocateZeroPool (StrSize (VariableName));

         ASSERT (Entry->Next->Name != NULL);

-        StrnCpy (Entry->Next->Name, VariableName, StrLen (VariableName));

+        StrCpyS (Entry->Next->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);

         Entry->Next->Volatile = Volatile;

       }

 

@@ -2853,7 +2853,7 @@ VariableLockRequestToLock (
   }

 

   Name = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));

-  StrnCpy   (Name, VariableName, StrLen (VariableName));

+  StrCpyS (Name, StrSize (VariableName)/sizeof(CHAR16), VariableName);

   CopyGuid (&Entry->Guid, VendorGuid);

   InsertTailList (&mLockedVariableList, &Entry->Link);