From 568a5119a1b16cca8faa68fce9e15853eb5a322d Mon Sep 17 00:00:00 2001 From: Qiu Shumin Date: Wed, 1 Jul 2015 08:34:22 +0000 Subject: MdeModulePkg/Universal/Variable: Use safe string functions to refine code. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin Reviewed-by: Star Zeng git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17789 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c | 2 +- MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'MdeModulePkg/Universal/Variable/RuntimeDxe') diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c index ab0c1d6324..61de47d357 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 70be71e7c7..e1dfeeaa03 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); -- cgit v1.2.3