1) Add type cast for better coding style.

2) replace StrCpy() usage in Variable driver with StrnCpy().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>


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

1 files changed, 6 insertions, 6 deletions

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 9101da37a6..fc7fbab5d6 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -139,9 +139,9 @@ UpdateVariableInfo (
       ASSERT (gVariableInfo != NULL);

 

       CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);

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

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

       ASSERT (gVariableInfo->Name != NULL);

-      StrCpy (gVariableInfo->Name, VariableName);

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

       gVariableInfo->Volatile = Volatile;

     }

 

@@ -175,9 +175,9 @@ UpdateVariableInfo (
         ASSERT (Entry->Next != NULL);

 

         CopyGuid (&Entry->Next->VendorGuid, VendorGuid);

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

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

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

-        StrCpy (Entry->Next->Name, VariableName);

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

         Entry->Next->Volatile = Volatile;

       }

 

@@ -2251,7 +2251,7 @@ VariableLockRequestToLock (
     return EFI_ACCESS_DENIED;

   }

 

-  Entry = AllocateRuntimePool (sizeof (*Entry) + StrSize (VariableName));

+  Entry = AllocateRuntimeZeroPool (sizeof (*Entry) + StrSize (VariableName));

   if (Entry == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

@@ -2261,7 +2261,7 @@ VariableLockRequestToLock (
   AcquireLockOnlyAtBootTime(&mVariableModuleGlobal->VariableGlobal.VariableServicesLock);

 

   Entry->Name = (CHAR16 *) (Entry + 1);

-  StrCpy   (Entry->Name, VariableName);

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

   CopyGuid (&Entry->Guid, VendorGuid);

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