summaryrefslogtreecommitdiff
path: root/ShellPkg
diff options
context:
space:
mode:
authorJaben Carsey <jaben.carsey@intel.com>2014-08-29 21:17:46 +0000
committerjcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>2014-08-29 21:17:46 +0000
commit531733377ac25083c7a54067a5330fb59f79bdfd (patch)
tree215fcf9afe94f32418965e4f9e4b18bafb0b1059 /ShellPkg
parent81957f8dfccd493ed77b5240b1c0c06f22defd2b (diff)
downloadedk2-platforms-531733377ac25083c7a54067a5330fb59f79bdfd.tar.xz
This patch replaces StrCpy with StrnCpy or refactors out the usage of StrCpy through some other means.
This patch replaces StrCat with StrnCat or refactors out the usage of StrCat through some other means. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jaben Carsey <jaben.carsey@intel.com> Reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16003 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ShellPkg')
-rw-r--r--ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c4
-rw-r--r--ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c20
2 files changed, 6 insertions, 18 deletions
diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 23ff12370e..a009609ffc 100644
--- a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
+++ b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
@@ -1,7 +1,7 @@
/** @file
Main file for support of shell consist mapping.
- Copyright (c) 2005 - 2012, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2005 - 2014, 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
@@ -98,7 +98,7 @@ CatPrint (
ASSERT (Str->Str != NULL);
}
- StrCat (Str->Str, AppendStr);
+ StrnCat (Str->Str, AppendStr, StringSize/sizeof(CHAR16) - 1 - StrLen(Str->Str));
Str->Len = StringSize;
FreePool (AppendStr);
diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index b3939ea4d6..3829ba1f8c 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -526,14 +526,9 @@ ShellCommandRegisterCommandName (
//
Node = AllocateZeroPool(sizeof(SHELL_COMMAND_INTERNAL_LIST_ENTRY));
ASSERT(Node != NULL);
- Node->CommandString = AllocateZeroPool(StrSize(CommandString));
+ Node->CommandString = AllocateCopyPool(StrSize(CommandString), CommandString);
ASSERT(Node->CommandString != NULL);
- //
- // populate the new struct
- //
- StrCpy(Node->CommandString, CommandString);
-
Node->GetManFileName = GetManFileName;
Node->CommandHandler = CommandHandler;
Node->LastError = CanAffectLE;
@@ -792,17 +787,11 @@ ShellCommandRegisterAlias (
//
Node = AllocateZeroPool(sizeof(ALIAS_LIST));
ASSERT(Node != NULL);
- Node->CommandString = AllocateZeroPool(StrSize(Command));
- Node->Alias = AllocateZeroPool(StrSize(Alias));
+ Node->CommandString = AllocateCopyPool(StrSize(Command), Command);
+ Node->Alias = AllocateCopyPool(StrSize(Alias), Alias);
ASSERT(Node->CommandString != NULL);
ASSERT(Node->Alias != NULL);
- //
- // populate the new struct
- //
- StrCpy(Node->CommandString, Command);
- StrCpy(Node->Alias , Alias );
-
InsertHeadList (&mAliasList.Link, &Node->Link);
//
@@ -1176,12 +1165,11 @@ ShellCommandAddMapItemAndUpdatePath(
Status = EFI_OUT_OF_RESOURCES;
} else {
MapListNode->Flags = Flags;
- MapListNode->MapName = AllocateZeroPool(StrSize(Name));
+ MapListNode->MapName = AllocateZeroPool(StrSize(Name), Name);
MapListNode->DevicePath = DuplicateDevicePath(DevicePath);
if ((MapListNode->MapName == NULL) || (MapListNode->DevicePath == NULL)){
Status = EFI_OUT_OF_RESOURCES;
} else {
- StrCpy(MapListNode->MapName, Name);
InsertTailList(&gShellMapList.Link, &MapListNode->Link);
}
}