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

Refine the code to make it more safely. 

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Jaben Carsey <Jaben.carsey@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13696 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
ydong10 2012-09-03 01:59:05 +00:00
parent 1ba76449b3
commit d6972185d0
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
View File

@ -17,7 +17,6 @@
#define INIT_NAME_BUFFER_SIZE 128 #define INIT_NAME_BUFFER_SIZE 128
#define INIT_DATA_BUFFER_SIZE 1024 #define INIT_DATA_BUFFER_SIZE 1024
#define INIT_ATTS_BUFFER_SIZE 64
/** /**
Base on the input attribute value to return the attribute string. Base on the input attribute value to return the attribute string.
@ -27,41 +26,45 @@
@retval The attribute string info. @retval The attribute string info.
**/ **/
CONST CHAR16 * CHAR16 *
EFIAPI EFIAPI
GetAttrType ( GetAttrType (
IN CONST UINT32 Atts, IN CONST UINT32 Atts
IN OUT CHAR16 *RetString
) )
{ {
StrCpy(RetString, L""); UINT32 BufLen;
CHAR16 *RetString;
BufLen = 0;
RetString = NULL;
if ((Atts & EFI_VARIABLE_NON_VOLATILE) != 0) { if ((Atts & EFI_VARIABLE_NON_VOLATILE) != 0) {
StrCat(RetString, L"+NV"); StrnCatGrow (&RetString, &BufLen, L"+NV", 0);
} }
if ((Atts & EFI_VARIABLE_RUNTIME_ACCESS) != 0) { if ((Atts & EFI_VARIABLE_RUNTIME_ACCESS) != 0) {
StrCat(RetString, L"+RS+BS"); StrnCatGrow (&RetString, &BufLen, L"+RS+BS", 0);
} else if ((Atts & EFI_VARIABLE_BOOTSERVICE_ACCESS) != 0) { } else if ((Atts & EFI_VARIABLE_BOOTSERVICE_ACCESS) != 0) {
StrCat(RetString, L"+BS"); StrnCatGrow (&RetString, &BufLen, L"+BS", 0);
} }
if ((Atts & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) { if ((Atts & EFI_VARIABLE_HARDWARE_ERROR_RECORD) != 0) {
StrCat(RetString, L"+HR"); StrnCatGrow (&RetString, &BufLen, L"+HR", 0);
} }
if ((Atts & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0) { if ((Atts & EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS) != 0) {
StrCat(RetString, L"+AW"); StrnCatGrow (&RetString, &BufLen, L"+AW", 0);
} }
if ((Atts & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0) { if ((Atts & EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS) != 0) {
StrCat(RetString, L"+AT"); StrnCatGrow (&RetString, &BufLen, L"+AT", 0);
}
if (RetString == NULL) {
RetString = StrnCatGrow(&RetString, &BufLen, L"Invalid", 0);
} }
if (RetString[0] == L'+') { if (RetString[0] == L'+') {
return (RetString+1); CopyMem(RetString, RetString + 1, StrSize(RetString + 1));
} }
if (RetString[0] == CHAR_NULL) {
StrCpy(RetString, L"invalid"); return RetString;
return (RetString);
}
return (RetString);
} }
/** /**
@ -98,7 +101,7 @@ ProcessVariables (
CHAR16 *OldName; CHAR16 *OldName;
UINTN OldNameBufferSize; UINTN OldNameBufferSize;
UINTN DataBufferSize; // Allocated data buffer size UINTN DataBufferSize; // Allocated data buffer size
CHAR16 RetString[INIT_ATTS_BUFFER_SIZE]; CHAR16 *RetString;
Found = FALSE; Found = FALSE;
ShellStatus = SHELL_SUCCESS; ShellStatus = SHELL_SUCCESS;
@ -186,6 +189,7 @@ ProcessVariables (
// do the print or delete // do the print or delete
// //
Found = TRUE; Found = TRUE;
RetString = GetAttrType(Atts);
if (!Delete) { if (!Delete) {
ShellPrintHiiEx( ShellPrintHiiEx(
-1, -1,
@ -193,7 +197,7 @@ ProcessVariables (
NULL, NULL,
STRING_TOKEN(STR_DMPSTORE_HEADER_LINE), STRING_TOKEN(STR_DMPSTORE_HEADER_LINE),
gShellDebug1HiiHandle, gShellDebug1HiiHandle,
GetAttrType(Atts, RetString), RetString,
&FoundVarGuid, &FoundVarGuid,
FoundVarName, FoundVarName,
DataSize); DataSize);
@ -216,6 +220,10 @@ ProcessVariables (
gRT->SetVariable(FoundVarName, &FoundVarGuid, Atts, 0, NULL)); gRT->SetVariable(FoundVarName, &FoundVarGuid, Atts, 0, NULL));
FoundVarName[0] = CHAR_NULL; FoundVarName[0] = CHAR_NULL;
} }
if (RetString != NULL) {
FreePool (RetString);
}
} }
if (FoundVarName != NULL) { if (FoundVarName != NULL) {