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

2 files changed, 6 insertions, 18 deletions

diff --git a/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c b/ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c
index 23ff12370..a009609ff 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 b3939ea4d..3829ba1f8 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);

     }

   }