EmbeddedPkg/Ebl: eliminate deprecated string function calls

[mirror_edk2.git] / EmbeddedPkg / Ebl / EfiDevice.c

diff --git a/EmbeddedPkg/Ebl/EfiDevice.c b/EmbeddedPkg/Ebl/EfiDevice.c
index ec9c331b70047bad00a60105eab2926eaf3a03ec..f6969e7b2b05ab63067a01a3d00613832bb73c01 100644 (file)
--- a/EmbeddedPkg/Ebl/EfiDevice.c
+++ b/EmbeddedPkg/Ebl/EfiDevice.c
@@ -343,7 +343,7 @@ EblStartCmd (
 \r
       ImageInfo->LoadOptionsSize = (UINT32)AsciiStrSize (Argv[2]);\r
       ImageInfo->LoadOptions     = AllocatePool (ImageInfo->LoadOptionsSize);\r
-      AsciiStrCpy (ImageInfo->LoadOptions, Argv[2]);\r
+      AsciiStrCpyS (ImageInfo->LoadOptions, ImageInfo->LoadOptionsSize, Argv[2]);\r
     }\r
 \r
     // Transfer control to the EFI image we loaded with LoadImage()\r
@@ -741,7 +741,7 @@ EblFileCopyCmd (
   UINTN         Size;\r
   UINTN         Offset;\r
   UINTN         Chunk        = FILE_COPY_CHUNK;\r
-  UINTN         FileNameLen;\r
+  UINTN         FileNameLen, DestFileNameLen;\r
   CHAR8*        DestFileName;\r
   CHAR8*        SrcFileName;\r
   CHAR8*        SrcPtr;\r
@@ -786,9 +786,10 @@ EblFileCopyCmd (
     }\r
 \r
     // Construct the destination filepath\r
-    DestFileName = (CHAR8*)AllocatePool (FileNameLen + AsciiStrLen (SrcFileName) + 1);\r
-    AsciiStrCpy (DestFileName, Argv[2]);\r
-    AsciiStrCat (DestFileName, SrcFileName);\r
+    DestFileNameLen = FileNameLen + AsciiStrLen (SrcFileName) + 1;\r
+    DestFileName = (CHAR8*)AllocatePool (DestFileNameLen);\r
+    AsciiStrCpyS (DestFileName, DestFileNameLen, Argv[2]);\r
+    AsciiStrCatS (DestFileName, DestFileNameLen, SrcFileName);\r
   }\r
 \r
   Source = EfiOpen(Argv[1], EFI_FILE_MODE_READ, 0);\r