From 531733377ac25083c7a54067a5330fb59f79bdfd Mon Sep 17 00:00:00 2001 From: Jaben Carsey Date: Fri, 29 Aug 2014 21:17:46 +0000 Subject: 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 Reviewed-by: Erik Bjorge git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16003 6f19259b-4bc3-4df7-8a09-765794883524 --- .../UefiShellCommandLib/UefiShellCommandLib.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c') 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); } } -- cgit v1.2.3