tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <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@15882 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Jaben Carsey 2014-08-22 16:06:55 +00:00 committed by jcarsey
parent cd92f93847
commit cea5e3b9bf
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main file for attrib shell level 2 function. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -194,12 +194,11 @@ ShellCommandRunCd (
// //
// change directory with a drive letter // change directory with a drive letter
// //
Drive = AllocateZeroPool(StrSize(Param1Copy)); Drive = AllocateCopyPool(StrSize(Param1Copy), Param1Copy);
if (Drive == NULL) { if (Drive == NULL) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle); ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_MEM), gShellLevel2HiiHandle);
ShellStatus = SHELL_OUT_OF_RESOURCES; ShellStatus = SHELL_OUT_OF_RESOURCES;
} else { } else {
Drive = StrCpy(Drive, Param1Copy);
Path = StrStr(Drive, L":"); Path = StrStr(Drive, L":");
ASSERT(Path != NULL); ASSERT(Path != NULL);
if (EFI_ERROR(ShellIsDirectory(Param1Copy))) { if (EFI_ERROR(ShellIsDirectory(Param1Copy))) {

6
ShellPkg/Library/UefiShellLevel2CommandsLib/Vol.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main file for vol shell level 2 function. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -101,7 +101,7 @@ HandleVol(
ASSERT(SysInfo != NULL); ASSERT(SysInfo != NULL);
if (Delete) { if (Delete) {
StrCpy ((CHAR16 *) SysInfo->VolumeLabel, L""); *((CHAR16 *) SysInfo->VolumeLabel) = CHAR_NULL;
SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize(SysInfo->VolumeLabel); SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + StrSize(SysInfo->VolumeLabel);
Status = EfiFpHandle->SetInfo( Status = EfiFpHandle->SetInfo(
EfiFpHandle, EfiFpHandle,
@ -119,7 +119,7 @@ HandleVol(
} }
} }
if (SysInfo != NULL) { 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; SysInfo->Size = SIZE_OF_EFI_FILE_SYSTEM_INFO + Size1;
Status = EfiFpHandle->SetInfo( Status = EfiFpHandle->SetInfo(
EfiFpHandle, EfiFpHandle,