tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 08:04:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct a bug that allocate a fix size buffer as input buffer for Hii->GetString. We will allocate it before we use it and free it after use.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3555 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12 2007-08-06 09:42:56 +00:00
parent fe8e4eb01c
commit 6bfce83ac4
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
View File

@ -332,17 +332,6 @@ ReInitStrings:
OptionCount = 0; OptionCount = 0;
//
// Try for a 512 byte Buffer
//
BufferSize = 0x200;
//
// Allocate memory for our Form binary
//
StringBuffer = AllocateZeroPool (BufferSize);
ASSERT (StringBuffer != NULL);
for (Index = 0; LanguageString[Index] != 0; Index += 3) { for (Index = 0; LanguageString[Index] != 0; Index += 3) {
Token = 0; Token = 0;
CopyMem (Lang, &LanguageString[Index], 6); CopyMem (Lang, &LanguageString[Index], 6);
@ -352,8 +341,14 @@ ReInitStrings:
mLastSelection = (UINT16) OptionCount; mLastSelection = (UINT16) OptionCount;
} }
BufferSize = 0;
Status = gHii->GetString (gHii, gStringPackHandle, 1, TRUE, Lang, &BufferSize, NULL);
ASSERT(Status == EFI_BUFFER_TOO_SMALL);
StringBuffer = AllocateZeroPool (BufferSize);
ASSERT (StringBuffer != NULL);
Status = gHii->GetString (gHii, gStringPackHandle, 1, TRUE, Lang, &BufferSize, StringBuffer); Status = gHii->GetString (gHii, gStringPackHandle, 1, TRUE, Lang, &BufferSize, StringBuffer);
gHii->NewString (gHii, NULL, gStringPackHandle, &Token, StringBuffer); gHii->NewString (gHii, NULL, gStringPackHandle, &Token, StringBuffer);
FreePool (StringBuffer);
CopyMem (&OptionList[OptionCount].StringToken, &Token, sizeof (UINT16)); CopyMem (&OptionList[OptionCount].StringToken, &Token, sizeof (UINT16));
CopyMem (&OptionList[OptionCount].Value, &OptionCount, sizeof (UINT16)); CopyMem (&OptionList[OptionCount].Value, &OptionCount, sizeof (UINT16));
Key = 0x1234; Key = 0x1234;
@ -365,7 +360,6 @@ ReInitStrings:
FreePool (LanguageString); FreePool (LanguageString);
if (ReInitializeStrings) { if (ReInitializeStrings) {
FreePool (StringBuffer);
FreePool (OptionList); FreePool (OptionList);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -391,7 +385,6 @@ ReInitStrings:
// //
// FreePool (OptionList); // FreePool (OptionList);
// //
FreePool (StringBuffer);
return Status; return Status;
} }