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

Fix the issue that HiiGetForms does not return correct BufferLength

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2474 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
klu2 2007-03-15 07:08:48 +00:00
parent f4e8c17bc2
commit 137749b7ed
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Forms.c
View File

@ -1,6 +1,7 @@
/*++ /**@file
This file contains the form processing code to the HII database.
Copyright (c) 2006, Intel Corporation
Copyright (c) 2006 - 2007 Intel Corporation. <BR>
All rights reserved. This program and the accompanying materials All rights reserved. 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
@ -9,15 +10,7 @@ http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name: **/
Forms.c
Abstract:
This file contains the form processing code to the HII database.
--*/
#include "HiiDatabase.h" #include "HiiDatabase.h"
@ -738,6 +731,7 @@ Returns:
EFI_IFR_FORM *Form; EFI_IFR_FORM *Form;
EFI_IFR_OP_HEADER *Location; EFI_IFR_OP_HEADER *Location;
UINT16 *BufferLength = (UINT16 *) BufferLengthTemp; UINT16 *BufferLength = (UINT16 *) BufferLengthTemp;
UINTN FormLength;
if (This == NULL) { if (This == NULL) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
@ -749,6 +743,8 @@ Returns:
PackageInstance = NULL; PackageInstance = NULL;
FormLength = 0;
// //
// Check numeric value against the head of the database // Check numeric value against the head of the database
// //
@ -809,19 +805,27 @@ Returns:
// If we found a Form Op-code and it is of the correct Id, copy it and return // If we found a Form Op-code and it is of the correct Id, copy it and return
// //
if (Form->FormId == FormId) { if (Form->FormId == FormId) {
if (Location->Length > *BufferLength || Buffer == NULL) { //
*BufferLength = Location->Length; // Calculate the total size of form
return EFI_BUFFER_TOO_SMALL; //
} else { for (FormLength = 0; Location->OpCode != EFI_IFR_END_FORM_OP; ) {
for (; Location->OpCode != EFI_IFR_END_FORM_OP;) { FormLength += Location->Length;
CopyMem (Buffer, Location, Location->Length); Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
Buffer = Buffer + Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
}
CopyMem (Buffer, Location, Location->Length);
return EFI_SUCCESS;
} }
FormLength += Location->Length;
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *) (Location) + Location->Length);
if ((Buffer == NULL) || (FormLength > *BufferLength)) {
*BufferLengthTemp = FormLength;
return EFI_BUFFER_TOO_SMALL;
}
//
// Rewind to start offset of the found Form
//
Location = (EFI_IFR_OP_HEADER *) ((CHAR8 *)Location - FormLength);
CopyMem (Buffer, Location, FormLength);
return EFI_SUCCESS;
} }
default: default:
@ -834,7 +838,7 @@ Returns:
} }
} }
return EFI_SUCCESS; return EFI_NOT_FOUND;
} }
// //