/** @file\r
Implementation of interfaces function for EFI_HII_CONFIG_ROUTING_PROTOCOL.\r
\r
-Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
Str = AllocateZeroPool (Length * sizeof (CHAR16));\r
ASSERT (Str != NULL);\r
\r
- StrCpy (Str, String);\r
- Length = (BufferLen * 2 + 1) * sizeof (CHAR16);\r
+ StrCpyS (Str, Length, String);\r
\r
StringHeader = Str + StrLen (String);\r
TemString = (CHAR16 *) StringHeader;\r
//\r
// Convert the uppercase to lowercase since <HexAf> is defined in lowercase format.\r
//\r
- StrCat (Str, L"&"); \r
+ StrCatS (Str, Length, L"&"); \r
HiiToLower (Str);\r
\r
*SubStr = Str;\r
{\r
UINTN AppendStringSize;\r
UINTN MultiStringSize;\r
+ UINTN MaxLen;\r
\r
if (MultiString == NULL || *MultiString == NULL || AppendString == NULL) {\r
return EFI_INVALID_PARAMETER;\r
\r
AppendStringSize = StrSize (AppendString);\r
MultiStringSize = StrSize (*MultiString);\r
+ MaxLen = MAX_STRING_LENGTH / sizeof (CHAR16);\r
\r
//\r
// Enlarge the buffer each time when length exceeds MAX_STRING_LENGTH.\r
MultiStringSize + AppendStringSize,\r
(VOID *) (*MultiString)\r
);\r
+ MaxLen = (MultiStringSize + AppendStringSize) / sizeof (CHAR16);\r
ASSERT (*MultiString != NULL);\r
}\r
//\r
// Append the incoming string\r
//\r
- StrCat (*MultiString, AppendString);\r
+ StrCatS (*MultiString, MaxLen, AppendString);\r
\r
return EFI_SUCCESS;\r
}\r
EFI_STRING AltConfigHdr;\r
UINTN HeaderLength;\r
UINTN SizeAltCfgResp;\r
+ UINTN MaxLen;\r
+ UINTN TotalSize;\r
\r
if (*AltCfgResp == NULL) {\r
return EFI_INVALID_PARAMETER;\r
// Construct AltConfigHdr string "&<ConfigHdr>&ALTCFG=XXXX\0"\r
// |1| StrLen (ConfigHdr) | 8 | 4 | 1 |\r
//\r
- AltConfigHdr = AllocateZeroPool ((1 + HeaderLength + 8 + 4 + 1) * sizeof (CHAR16));\r
+ MaxLen = 1 + HeaderLength + 8 + 4 + 1;\r
+ AltConfigHdr = AllocateZeroPool (MaxLen * sizeof (CHAR16));\r
if (AltConfigHdr == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- StrCpy (AltConfigHdr, L"&");\r
- StrnCat (AltConfigHdr, *AltCfgResp, HeaderLength);\r
- StrCat (AltConfigHdr, L"&ALTCFG=");\r
+ StrCpyS (AltConfigHdr, MaxLen, L"&");\r
+ StrnCatS (AltConfigHdr, MaxLen, *AltCfgResp, HeaderLength);\r
+ StrCatS (AltConfigHdr, MaxLen, L"&ALTCFG=");\r
HeaderLength = StrLen (AltConfigHdr);\r
\r
StringPtrDefault = StrStr (DefaultAltCfgResp, AltConfigHdr);\r
//\r
// Get AltCfg Name\r
//\r
- StrnCat (AltConfigHdr, StringPtrDefault + HeaderLength, 4);\r
+ StrnCatS (AltConfigHdr, MaxLen, StringPtrDefault + HeaderLength, 4);\r
StringPtr = StrStr (*AltCfgResp, AltConfigHdr); \r
\r
//\r
if (StringPtr == NULL) {\r
StringPtrEnd = StrStr (StringPtrDefault + 1, L"&GUID");\r
SizeAltCfgResp = StrSize (*AltCfgResp);\r
+ TotalSize = SizeAltCfgResp + StrSize (StringPtrDefault);\r
if (StringPtrEnd == NULL) {\r
//\r
// No more default string is found.\r
//\r
*AltCfgResp = (EFI_STRING) ReallocatePool (\r
SizeAltCfgResp,\r
- SizeAltCfgResp + StrSize (StringPtrDefault),\r
+ TotalSize,\r
(VOID *) (*AltCfgResp)\r
);\r
if (*AltCfgResp == NULL) {\r
FreePool (AltConfigHdr);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- StrCat (*AltCfgResp, StringPtrDefault);\r
+ StrCatS (*AltCfgResp, TotalSize / sizeof (CHAR16), StringPtrDefault);\r
break;\r
} else {\r
TempChar = *StringPtrEnd;\r
*StringPtrEnd = L'\0';\r
*AltCfgResp = (EFI_STRING) ReallocatePool (\r
SizeAltCfgResp,\r
- SizeAltCfgResp + StrSize (StringPtrDefault),\r
+ TotalSize,\r
(VOID *) (*AltCfgResp)\r
);\r
if (*AltCfgResp == NULL) {\r
FreePool (AltConfigHdr);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- StrCat (*AltCfgResp, StringPtrDefault);\r
+ StrCatS (*AltCfgResp, TotalSize / sizeof (CHAR16), StringPtrDefault);\r
*StringPtrEnd = TempChar;\r
}\r
}\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
- StrCpy (TempStr, GuidStr);\r
- StrCat (TempStr, NameStr);\r
+ StrCpyS (TempStr, LengthString, GuidStr);\r
+ StrCatS (TempStr, LengthString, NameStr);\r
if (ConfigHdr == NULL || StrnCmp (ConfigHdr, TempStr, StrLen (TempStr)) == 0) {\r
*EfiVarStore = (EFI_IFR_VARSTORE_EFI *) AllocateZeroPool (IfrOpHdr->Length);\r
if (*EfiVarStore == NULL) {\r
goto Done;\r
}\r
\r
- StrCpy (TempStr, GuidStr);\r
- StrCat (TempStr, NameStr);\r
+ StrCpyS (TempStr, LengthString, GuidStr);\r
+ StrCatS (TempStr, LengthString, NameStr);\r
\r
if (ConfigHdr == NULL || StrnCmp (ConfigHdr, TempStr, StrLen (TempStr)) == 0) {\r
RetVal = TRUE;\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
-\r
- //\r
- // No default value for string.\r
- //\r
- BlockData = NULL;\r
break;\r
\r
case EFI_IFR_PASSWORD_OP:\r
IFR_BLOCK_DATA *NextBlockData;\r
UINTN Length;\r
\r
+ TmpBuffer = NULL;\r
+\r
//\r
// Init RequestBlockArray\r
//\r
//\r
// Start with <ConfigHdr>\r
//\r
- StrCpy (StringPtr, ConfigHdr);\r
+ StrCpyS (StringPtr, Length, ConfigHdr);\r
StringPtr += StrLen (StringPtr);\r
\r
//\r
Status = EFI_OUT_OF_RESOURCES;\r
goto Done;\r
}\r
- StrCpy (*ConfigHdr, GuidStr);\r
- StrCat (*ConfigHdr, NameStr);\r
+ StrCpyS (*ConfigHdr, Length, GuidStr);\r
+ StrCatS (*ConfigHdr, Length, NameStr);\r
if (VarStorageData->Name == NULL) {\r
- StrCat (*ConfigHdr, L"&");\r
+ StrCatS (*ConfigHdr, Length, L"&");\r
}\r
- StrCat (*ConfigHdr, PathStr);\r
+ StrCatS (*ConfigHdr, Length, PathStr);\r
\r
//\r
// Remove the last character L'&'\r
/**\r
Generate ConfigAltResp string base on the varstore info.\r
\r
+ @param HiiHandle Hii Handle for this hii package.\r
@param ConfigHdr The config header for this varstore.\r
@param VarStorageData The varstore info.\r
@param DefaultIdArray The Default id array.\r
**/\r
EFI_STATUS\r
GenerateAltConfigResp (\r
+ IN EFI_HII_HANDLE HiiHandle,\r
IN CHAR16 *ConfigHdr,\r
IN IFR_VARSTORAGE_DATA *VarStorageData,\r
IN IFR_DEFAULT_DATA *DefaultIdArray,\r
IFR_DEFAULT_DATA *DefaultValueData;\r
UINTN Width;\r
UINT8 *TmpBuffer;\r
+ CHAR16 *DefaultString;\r
\r
BlockData = NULL;\r
DataExist = FALSE;\r
-\r
+ DefaultString = NULL;\r
//\r
// Add length for <ConfigHdr> + '\0'\r
//\r
//\r
// Start with <ConfigHdr>\r
//\r
- StrCpy (StringPtr, ConfigHdr);\r
+ StrCpyS (StringPtr, Length, ConfigHdr);\r
StringPtr += StrLen (StringPtr);\r
\r
for (Link = DefaultIdArray->Entry.ForwardLink; Link != &DefaultIdArray->Entry; Link = Link->ForwardLink) {\r
// Convert Value to a hex string in "%x" format\r
// NOTE: This is in the opposite byte that GUID and PATH use\r
//\r
- TmpBuffer = (UINT8 *) &(DefaultValueData->Value);\r
- for (; Width > 0; Width--) {\r
+ if (BlockData->OpCode == EFI_IFR_STRING_OP){\r
+ DefaultString = InternalGetString(HiiHandle, DefaultValueData->Value.string);\r
+ TmpBuffer = (UINT8 *) DefaultString;\r
+ } else {\r
+ TmpBuffer = (UINT8 *) &(DefaultValueData->Value);\r
+ }\r
+ for (; Width > 0 && (TmpBuffer != NULL); Width--) {\r
StringPtr += UnicodeValueToString (StringPtr, PREFIX_ZERO | RADIX_HEX, TmpBuffer[Width - 1], 2);\r
}\r
+ if (DefaultString != NULL){\r
+ FreePool(DefaultString);\r
+ DefaultString = NULL;\r
+ }\r
}\r
}\r
}\r
// Go through all VarStorageData Entry and get the DefaultId array for each one\r
// Then construct them all to : ConfigHdr AltConfigHdr ConfigBody AltConfigHdr ConfigBody\r
//\r
- Status = GenerateAltConfigResp (ConfigHdr, VarStorageData, DefaultIdArray, &DefaultAltCfgResp);\r
+ Status = GenerateAltConfigResp (DataBaseRecord->Handle,ConfigHdr, VarStorageData, DefaultIdArray, &DefaultAltCfgResp);\r
if (EFI_ERROR (Status)) {\r
goto Done;\r
}\r
);\r
}\r
if (EFI_ERROR (Status)) {\r
+ ASSERT (AccessProgress != NULL);\r
//\r
// AccessProgress indicates the parsing progress on <ConfigResp>.\r
// Map it to the progress on <MultiConfigResp> then return it.\r
CHAR16 *TemString;\r
CHAR16 TemChar;\r
\r
+ TmpBuffer = NULL;\r
+\r
if (This == NULL || Progress == NULL || Config == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
*(ConfigElement + (StringPtr - TmpPtr)) = L'&';\r
}\r
*(ConfigElement + (StringPtr - TmpPtr) + 1) = 0;\r
- StrCat (ConfigElement, L"VALUE=");\r
- StrCat (ConfigElement, ValueStr);\r
+ StrCatS (ConfigElement, Length, L"VALUE=");\r
+ StrCatS (ConfigElement, Length, ValueStr);\r
\r
AppendToMultiString (Config, ConfigElement);\r
\r
UINTN BufferSize;\r
UINTN MaxBlockSize;\r
\r
+ TmpBuffer = NULL;\r
+\r
if (This == NULL || BlockSize == NULL || Progress == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
if (*AltCfgResp == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
} else {\r
- StrnCpy (*AltCfgResp, HdrStart, HdrEnd - HdrStart);\r
- StrCat (*AltCfgResp, Result);\r
+ StrnCpyS (*AltCfgResp, Length, HdrStart, HdrEnd - HdrStart);\r
+ StrCatS (*AltCfgResp, Length, Result);\r
Status = EFI_SUCCESS;\r
}\r
}\r
projects / mirror_edk2.git / blobdiff