Revision: 15882
http://sourceforge.net/p/edk2/code/15882
Author: jcarsey
Date: 2014-08-22 16:06:55 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
ShellPkg: Refactor string manipulation
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 <[email protected]>
Reviewed-by: Erik Bjorge <[email protected]>
Modified Paths:
--------------
trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c 2014-08-22
15:56:54 UTC (rev 15881)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c 2014-08-22
16:06:55 UTC (rev 15882)
@@ -1,7 +1,7 @@
/** @file
Main file for attrib shell level 2 function.
- Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 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
@@ -194,12 +194,11 @@
//
// change directory with a drive letter
//
- Drive = AllocateZeroPool(StrSize(Param1Copy));
+ Drive = AllocateCopyPool(StrSize(Param1Copy), Param1Copy);
if (Drive == NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM),
gShellLevel2HiiHandle);
ShellStatus = SHELL_OUT_OF_RESOURCES;
} else {
- Drive = StrCpy(Drive, Param1Copy);
Path = StrStr(Drive, L":");
ASSERT(Path != NULL);
if (EFI_ERROR(ShellIsDirectory(Param1Copy))) {
Modified: trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
===================================================================
--- trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
2014-08-22 15:56:54 UTC (rev 15881)
+++ trunk/edk2/ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
2014-08-22 16:06:55 UTC (rev 15882)
@@ -1,7 +1,7 @@
/** @file
Main file for vol shell level 2 function.
- Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2011 - 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
@@ -101,7 +101,7 @@
ASSERT(SysInfo != NULL);
if (Delete) {
- StrCpy ((CHAR16 *) SysInfo->VolumeLabel, L"");
+ *((CHAR16 *) SysInfo->VolumeLabel) = CHAR_NULL;
SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO +
StrSize(SysInfo->VolumeLabel);
Status = EfiFpHandle->SetInfo(
EfiFpHandle,
@@ -119,7 +119,7 @@
}
}
if (SysInfo != NULL) {
- StrCpy ((CHAR16 *) SysInfo->VolumeLabel, Name);
+ StrnCpy ((CHAR16 *) SysInfo->VolumeLabel, Name, (Size1 >
Size2?Size1/sizeof(CHAR16):Size2/sizeof(CHAR16))-1);
SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;
Status = EfiFpHandle->SetInfo(
EfiFpHandle,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
