tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-31 01:24:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Qiu Shumin 2015-07-01 08:34:22 +00:00 committed by shenshushi
parent 5e4b8bfe43
commit 568a5119a1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
View File

@ -3,7 +3,7 @@
Emulation Variable services operate on the runtime volatile memory. Emulation Variable services operate on the runtime volatile memory.
The nonvolatile variable space doesn't exist. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -322,7 +322,7 @@ UpdateVariableInfo (
CopyGuid (&gVariableInfo->VendorGuid, VendorGuid); CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);
gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName)); gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));
ASSERT (gVariableInfo->Name != NULL); ASSERT (gVariableInfo->Name != NULL);
StrnCpy (gVariableInfo->Name, VariableName, StrLen (VariableName)); StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);
gVariableInfo->Volatile = Volatile; gVariableInfo->Volatile = Volatile;
gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo); gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);
@ -360,7 +360,7 @@ UpdateVariableInfo (
CopyGuid (&Entry->Next->VendorGuid, VendorGuid); CopyGuid (&Entry->Next->VendorGuid, VendorGuid);
Entry->Next->Name = AllocateZeroPool (StrSize (VariableName)); Entry->Next->Name = AllocateZeroPool (StrSize (VariableName));
ASSERT (Entry->Next->Name != NULL); 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; Entry->Next->Volatile = Volatile;
} }

2
MdeModulePkg/Universal/Variable/RuntimeDxe/VarCheck.c
View File

@ -1046,7 +1046,7 @@ InternalVarCheckVariablePropertySet (
goto Done; goto Done;
} }
VariableName = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry)); VariableName = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));
StrnCpy (VariableName, Name, StrLen (Name)); StrCpyS (VariableName, StrSize(Name)/sizeof(CHAR16), Name);
CopyGuid (&Entry->Guid, Guid); CopyGuid (&Entry->Guid, Guid);
CopyMem (&Entry->VariableProperty, VariableProperty, sizeof (*VariableProperty)); CopyMem (&Entry->VariableProperty, VariableProperty, sizeof (*VariableProperty));
InsertTailList (&mVarCheckVariableList, &Entry->Link); InsertTailList (&mVarCheckVariableList, &Entry->Link);

6
MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
View File

@ -158,7 +158,7 @@ UpdateVariableInfo (
CopyGuid (&gVariableInfo->VendorGuid, VendorGuid); CopyGuid (&gVariableInfo->VendorGuid, VendorGuid);
gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName)); gVariableInfo->Name = AllocateZeroPool (StrSize (VariableName));
ASSERT (gVariableInfo->Name != NULL); ASSERT (gVariableInfo->Name != NULL);
StrnCpy (gVariableInfo->Name, VariableName, StrLen (VariableName)); StrCpyS (gVariableInfo->Name, StrSize(VariableName)/sizeof(CHAR16), VariableName);
gVariableInfo->Volatile = Volatile; gVariableInfo->Volatile = Volatile;
} }
@ -194,7 +194,7 @@ UpdateVariableInfo (
CopyGuid (&Entry->Next->VendorGuid, VendorGuid); CopyGuid (&Entry->Next->VendorGuid, VendorGuid);
Entry->Next->Name = AllocateZeroPool (StrSize (VariableName)); Entry->Next->Name = AllocateZeroPool (StrSize (VariableName));
ASSERT (Entry->Next->Name != NULL); 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; Entry->Next->Volatile = Volatile;
} }
@ -2853,7 +2853,7 @@ VariableLockRequestToLock (
} }
Name = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry)); Name = (CHAR16 *) ((UINTN) Entry + sizeof (*Entry));
StrnCpy (Name, VariableName, StrLen (VariableName)); StrCpyS (Name, StrSize (VariableName)/sizeof(CHAR16), VariableName);
CopyGuid (&Entry->Guid, VendorGuid); CopyGuid (&Entry->Guid, VendorGuid);
InsertTailList (&mLockedVariableList, &Entry->Link); InsertTailList (&mLockedVariableList, &Entry->Link);