This patch replaces StrCpy with StrnCpy or refactors out the usage of StrCpy through...

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel2CommandsLib / Map.c

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
index 5329be41921a59f0f8a894a125a052079070619c..ec204c30bc213265f06b96d22ca1e861c45e22dd 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
@@ -228,13 +228,12 @@ MappingListHasType(
   // specific has priority\r
   //\r
   if (Specific != NULL) {\r
-    NewSpecific = AllocateZeroPool(StrSize(Specific) + sizeof(CHAR16));\r
+    NewSpecific = AllocateCopyPool(StrSize(Specific) + sizeof(CHAR16), Specific);\r
     if (NewSpecific == NULL){\r
       return FALSE;\r
     }\r
-    StrCpy(NewSpecific, Specific);\r
     if (NewSpecific[StrLen(NewSpecific)-1] != L':') {\r
-      StrCat(NewSpecific, L":");\r
+      StrnCat(NewSpecific, L":", 2);\r
     }\r
 \r
     if (SearchList(MapList, NewSpecific, NULL, TRUE, FALSE, L";")) {\r
@@ -877,13 +876,12 @@ AddMappingFromMapping(
   EFI_STATUS                      Status;\r
   CHAR16                          *NewSName;\r
   \r
-  NewSName = AllocateZeroPool(StrSize(SName) + sizeof(CHAR16));\r
+  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
-  StrCpy(NewSName, SName);\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r
-    StrCat(NewSName, L":");\r
+    StrnCat(NewSName, L":", 2);\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r
@@ -930,13 +928,12 @@ AddMappingFromHandle(
   EFI_STATUS                Status;\r
   CHAR16                    *NewSName;\r
   \r
-  NewSName = AllocateZeroPool(StrSize(SName) + sizeof(CHAR16));\r
+  NewSName = AllocateCopyPool(StrSize(SName) + sizeof(CHAR16), SName);\r
   if (NewSName == NULL) {\r
     return (SHELL_OUT_OF_RESOURCES);\r
   }\r
-  StrCpy(NewSName, SName);\r
   if (NewSName[StrLen(NewSName)-1] != L':') {\r
-    StrCat(NewSName, L":");\r
+    StrnCat(NewSName, L":", 2);\r
   }\r
 \r
   if (!IsNumberLetterOnly(NewSName, StrLen(NewSName)-1)) {\r