mirror of https://github.com/acidanthera/audk.git
MdeModulePkg:Use safe string functions in UiApp.
Replace the unsafe string functions with the safe one in UiApp. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi <dandan.bi@intel.com> Reviewed-by: Qiu Shumin <shumin.qiu@intel.com> Reviewed-by: Eric Dong <eric.dong@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18214 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
0cd1ecea67
commit
d91cb87049
|
@ -786,7 +786,7 @@ BOpt_GetBootOptions (
|
||||||
|
|
||||||
NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));
|
NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));
|
||||||
ASSERT (NewLoadContext->Description != NULL);
|
ASSERT (NewLoadContext->Description != NULL);
|
||||||
StrCpy (NewLoadContext->Description, (UINT16*)LoadOptionPtr);
|
StrCpyS (NewLoadContext->Description, StrSize((UINT16*)LoadOptionPtr) / sizeof (UINT16), (UINT16*)LoadOptionPtr);
|
||||||
|
|
||||||
ASSERT (NewLoadContext->Description != NULL);
|
ASSERT (NewLoadContext->Description != NULL);
|
||||||
NewMenuEntry->DisplayString = NewLoadContext->Description;
|
NewMenuEntry->DisplayString = NewLoadContext->Description;
|
||||||
|
@ -862,27 +862,25 @@ BOpt_AppendFileName (
|
||||||
IN CHAR16 *Str2
|
IN CHAR16 *Str2
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINTN Size1;
|
UINTN DestMax;
|
||||||
UINTN Size2;
|
|
||||||
CHAR16 *Str;
|
CHAR16 *Str;
|
||||||
CHAR16 *TmpStr;
|
CHAR16 *TmpStr;
|
||||||
CHAR16 *Ptr;
|
CHAR16 *Ptr;
|
||||||
CHAR16 *LastSlash;
|
CHAR16 *LastSlash;
|
||||||
|
|
||||||
Size1 = StrSize (Str1);
|
DestMax = (StrSize (Str1) + StrSize (Str2) + sizeof (CHAR16)) / sizeof (CHAR16);
|
||||||
Size2 = StrSize (Str2);
|
Str = AllocateZeroPool (DestMax * sizeof (CHAR16));
|
||||||
Str = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
|
|
||||||
ASSERT (Str != NULL);
|
ASSERT (Str != NULL);
|
||||||
|
|
||||||
TmpStr = AllocateZeroPool (Size1 + Size2 + sizeof (CHAR16));
|
TmpStr = AllocateZeroPool (DestMax * sizeof (CHAR16));
|
||||||
ASSERT (TmpStr != NULL);
|
ASSERT (TmpStr != NULL);
|
||||||
|
|
||||||
StrCat (Str, Str1);
|
StrCatS (Str, DestMax, Str1);
|
||||||
if (!((*Str == '\\') && (*(Str + 1) == 0))) {
|
if (!((*Str == '\\') && (*(Str + 1) == 0))) {
|
||||||
StrCat (Str, L"\\");
|
StrCatS (Str, DestMax, L"\\");
|
||||||
}
|
}
|
||||||
|
|
||||||
StrCat (Str, Str2);
|
StrCatS (Str, DestMax, Str2);
|
||||||
|
|
||||||
Ptr = Str;
|
Ptr = Str;
|
||||||
LastSlash = Str;
|
LastSlash = Str;
|
||||||
|
@ -895,11 +893,11 @@ BOpt_AppendFileName (
|
||||||
//
|
//
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of two strings
|
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
|
||||||
// that overlap.
|
// that overlap.
|
||||||
//
|
//
|
||||||
StrCpy (TmpStr, Ptr + 3);
|
StrCpyS (TmpStr, DestMax, Ptr + 3);
|
||||||
StrCpy (LastSlash, TmpStr);
|
StrCpyS (LastSlash, DestMax - (UINTN) (LastSlash - Str), TmpStr);
|
||||||
Ptr = LastSlash;
|
Ptr = LastSlash;
|
||||||
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
|
} else if (*Ptr == '\\' && *(Ptr + 1) == '.' && *(Ptr + 2) == '\\') {
|
||||||
//
|
//
|
||||||
|
@ -907,11 +905,11 @@ BOpt_AppendFileName (
|
||||||
//
|
//
|
||||||
|
|
||||||
//
|
//
|
||||||
// Use TmpStr as a backup, as StrCpy in BaseLib does not handle copy of two strings
|
// Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
|
||||||
// that overlap.
|
// that overlap.
|
||||||
//
|
//
|
||||||
StrCpy (TmpStr, Ptr + 2);
|
StrCpyS (TmpStr, DestMax, Ptr + 2);
|
||||||
StrCpy (Ptr, TmpStr);
|
StrCpyS (Ptr, DestMax - (UINTN) (Ptr - Str), TmpStr);
|
||||||
Ptr = LastSlash;
|
Ptr = LastSlash;
|
||||||
} else if (*Ptr == '\\') {
|
} else if (*Ptr == '\\') {
|
||||||
LastSlash = Ptr;
|
LastSlash = Ptr;
|
||||||
|
|
|
@ -195,7 +195,7 @@ typedef struct {
|
||||||
/// This is the data structure used by File Explorer formset
|
/// This is the data structure used by File Explorer formset
|
||||||
///
|
///
|
||||||
typedef struct {
|
typedef struct {
|
||||||
UINT16 DescriptionData[75];
|
UINT16 DescriptionData[MAX_MENU_NUMBER];
|
||||||
UINT16 OptionalData[127];
|
UINT16 OptionalData[127];
|
||||||
UINT8 Active;
|
UINT8 Active;
|
||||||
UINT8 ForceReconnect;
|
UINT8 ForceReconnect;
|
||||||
|
|
|
@ -838,7 +838,7 @@ UpdateConModePage (
|
||||||
//
|
//
|
||||||
UnicodeValueToString (ModeString, 0, Col, 0);
|
UnicodeValueToString (ModeString, 0, Col, 0);
|
||||||
PStr = &ModeString[0];
|
PStr = &ModeString[0];
|
||||||
StrnCat (PStr, L" x ", StrLen(L" x ") + 1);
|
StrnCatS (PStr, sizeof (ModeString) / sizeof (ModeString[0]), L" x ", StrLen(L" x ") + 1);
|
||||||
PStr = PStr + StrLen (PStr);
|
PStr = PStr + StrLen (PStr);
|
||||||
UnicodeValueToString (PStr , 0, Row, 0);
|
UnicodeValueToString (PStr , 0, Row, 0);
|
||||||
|
|
||||||
|
|
|
@ -559,7 +559,7 @@ Var_UpdateDriverOption (
|
||||||
);
|
);
|
||||||
|
|
||||||
if (*DescriptionData == 0x0000) {
|
if (*DescriptionData == 0x0000) {
|
||||||
StrCpy (DescriptionData, DriverString);
|
StrCpyS (DescriptionData, MAX_MENU_NUMBER, DriverString);
|
||||||
}
|
}
|
||||||
|
|
||||||
BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (DescriptionData);
|
BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (DescriptionData);
|
||||||
|
@ -727,7 +727,7 @@ Var_UpdateBootOption (
|
||||||
UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", Index);
|
UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", Index);
|
||||||
|
|
||||||
if (NvRamMap->DescriptionData[0] == 0x0000) {
|
if (NvRamMap->DescriptionData[0] == 0x0000) {
|
||||||
StrCpy (NvRamMap->DescriptionData, BootString);
|
StrCpyS (NvRamMap->DescriptionData, sizeof (NvRamMap->DescriptionData) / sizeof (NvRamMap->DescriptionData[0]), BootString);
|
||||||
}
|
}
|
||||||
|
|
||||||
BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (NvRamMap->DescriptionData);
|
BufferSize = sizeof (UINT32) + sizeof (UINT16) + StrSize (NvRamMap->DescriptionData);
|
||||||
|
|
|
@ -236,6 +236,7 @@ EnumerateBootOptions (
|
||||||
BOOLEAN IsLegacyOption;
|
BOOLEAN IsLegacyOption;
|
||||||
BOOLEAN NeedEndOp;
|
BOOLEAN NeedEndOp;
|
||||||
UINT16 KeyInput;
|
UINT16 KeyInput;
|
||||||
|
UINTN DestMax;
|
||||||
|
|
||||||
DeviceType = (UINT16) -1;
|
DeviceType = (UINT16) -1;
|
||||||
|
|
||||||
|
@ -325,10 +326,11 @@ EnumerateBootOptions (
|
||||||
|
|
||||||
TempStr = UiDevicePathToStr (BootOption[Index].FilePath);
|
TempStr = UiDevicePathToStr (BootOption[Index].FilePath);
|
||||||
TempSize = StrSize (TempStr);
|
TempSize = StrSize (TempStr);
|
||||||
|
DestMax = (TempSize + StrSize (L"Device Path : ")) / sizeof(CHAR16);
|
||||||
HelpString = AllocateZeroPool (TempSize + StrSize (L"Device Path : "));
|
HelpString = AllocateZeroPool (TempSize + StrSize (L"Device Path : "));
|
||||||
ASSERT (HelpString != NULL);
|
ASSERT (HelpString != NULL);
|
||||||
StrCat (HelpString, L"Device Path : ");
|
StrCatS (HelpString, DestMax, L"Device Path : ");
|
||||||
StrCat (HelpString, TempStr);
|
StrCatS (HelpString, DestMax, TempStr);
|
||||||
|
|
||||||
HelpToken = HiiSetString (HiiHandle, 0, HelpString, NULL);
|
HelpToken = HiiSetString (HiiHandle, 0, HelpString, NULL);
|
||||||
|
|
||||||
|
|
|
@ -172,7 +172,7 @@ GetMacAddressString(
|
||||||
}
|
}
|
||||||
|
|
||||||
*PBuffer = String;
|
*PBuffer = String;
|
||||||
StrCpy(String, L"MAC:");
|
StrCpyS(String, BufferLen / sizeof (CHAR16), L"MAC:");
|
||||||
String += 4;
|
String += 4;
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
|
@ -645,6 +645,7 @@ ConvertProcessorToString (
|
||||||
{
|
{
|
||||||
CHAR16 *StringBuffer;
|
CHAR16 *StringBuffer;
|
||||||
UINTN Index;
|
UINTN Index;
|
||||||
|
UINTN DestMax;
|
||||||
UINT32 FreqMhz;
|
UINT32 FreqMhz;
|
||||||
|
|
||||||
if (Base10Exponent >= 6) {
|
if (Base10Exponent >= 6) {
|
||||||
|
@ -655,13 +656,13 @@ ConvertProcessorToString (
|
||||||
} else {
|
} else {
|
||||||
FreqMhz = 0;
|
FreqMhz = 0;
|
||||||
}
|
}
|
||||||
|
DestMax = 0x20 / sizeof (CHAR16);
|
||||||
StringBuffer = AllocateZeroPool (0x20);
|
StringBuffer = AllocateZeroPool (0x20);
|
||||||
ASSERT (StringBuffer != NULL);
|
ASSERT (StringBuffer != NULL);
|
||||||
Index = UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, FreqMhz / 1000, 3);
|
Index = UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, FreqMhz / 1000, 3);
|
||||||
StrCat (StringBuffer, L".");
|
StrCatS (StringBuffer, DestMax, L".");
|
||||||
UnicodeValueToString (StringBuffer + Index + 1, PREFIX_ZERO, (FreqMhz % 1000) / 10, 2);
|
UnicodeValueToString (StringBuffer + Index + 1, PREFIX_ZERO, (FreqMhz % 1000) / 10, 2);
|
||||||
StrCat (StringBuffer, L" GHz");
|
StrCatS (StringBuffer, DestMax, L" GHz");
|
||||||
*String = (CHAR16 *) StringBuffer;
|
*String = (CHAR16 *) StringBuffer;
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
@ -685,7 +686,7 @@ ConvertMemorySizeToString (
|
||||||
StringBuffer = AllocateZeroPool (0x24);
|
StringBuffer = AllocateZeroPool (0x24);
|
||||||
ASSERT (StringBuffer != NULL);
|
ASSERT (StringBuffer != NULL);
|
||||||
UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, MemorySize, 10);
|
UnicodeValueToString (StringBuffer, LEFT_JUSTIFY, MemorySize, 10);
|
||||||
StrCat (StringBuffer, L" MB RAM");
|
StrCatS (StringBuffer, 0x24 / sizeof (CHAR16), L" MB RAM");
|
||||||
|
|
||||||
*String = (CHAR16 *) StringBuffer;
|
*String = (CHAR16 *) StringBuffer;
|
||||||
|
|
||||||
|
@ -1542,8 +1543,8 @@ SetupResetReminder (
|
||||||
ASSERT (StringBuffer1 != NULL);
|
ASSERT (StringBuffer1 != NULL);
|
||||||
StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
|
StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));
|
||||||
ASSERT (StringBuffer2 != NULL);
|
ASSERT (StringBuffer2 != NULL);
|
||||||
StrCpy (StringBuffer1, L"Configuration changed. Reset to apply it Now.");
|
StrCpyS (StringBuffer1, MAX_STRING_LEN, L"Configuration changed. Reset to apply it Now.");
|
||||||
StrCpy (StringBuffer2, L"Press ENTER to reset");
|
StrCpyS (StringBuffer2, MAX_STRING_LEN, L"Press ENTER to reset");
|
||||||
//
|
//
|
||||||
// Popup a menu to notice user
|
// Popup a menu to notice user
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in New Issue