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

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / Variable.c

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 70be71e7c76237dd6e454c66e777271e76d3f7dd..e1dfeeaa031d0bb98b8c77d956ababefd523efdb 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -158,7 +158,7 @@ UpdateVariableInfo (
       CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);\r
       gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));\r
       ASSERT (gVariableInfo->Name != NULL);\r
-      StrnCpy (gVariableInfo->Name, VariableName, StrLen (VariableName));\r
+      StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);\r
       gVariableInfo->Volatile = Volatile;\r
     }\r
 \r
@@ -194,7 +194,7 @@ UpdateVariableInfo (
         CopyGuid (&Entry->Next->VendorGuid, VendorGuid);\r
         Entry->Next->Name = AllocateZeroPool (StrSize (VariableName));\r
         ASSERT (Entry->Next->Name != NULL);\r
-        StrnCpy (Entry->Next->Name, VariableName, StrLen (VariableName));\r
+        StrCpyS (Entry->Next->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);\r
         Entry->Next->Volatile = Volatile;\r
       }\r
 \r
@@ -2853,7 +2853,7 @@ VariableLockRequestToLock (
   }\r
 \r
   Name = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));\r
-  StrnCpy   (Name, VariableName, StrLen (VariableName));\r
+  StrCpyS (Name, StrSize (VariableName)/sizeof(CHAR16), VariableName);\r
   CopyGuid (&Entry->Guid, VendorGuid);\r
   InsertTailList (&mLockedVariableList, &Entry->Link);\r
 \r