Fix a bug that FV->ReadSection cannot get the EFI_SECTION_GUID_DEFINED type section data.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10385 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
niruiyu 2010-04-21 02:41:15 +00:00
parent 3140ceda76
commit 5efb9132d3
1 changed files with 7 additions and 7 deletions

View File

@ -327,7 +327,7 @@ OpenSectionStreamEx (
) )
{ {
FRAMEWORK_SECTION_STREAM_NODE *NewStream; FRAMEWORK_SECTION_STREAM_NODE *NewStream;
EFI_TPL OldTpl; EFI_TPL OldTpl;
// //
// Allocate a new stream // Allocate a new stream
@ -446,8 +446,8 @@ BOOLEAN
ChildIsType ( ChildIsType (
IN FRAMEWORK_SECTION_STREAM_NODE *Stream, IN FRAMEWORK_SECTION_STREAM_NODE *Stream,
IN FRAMEWORK_SECTION_CHILD_NODE *Child, IN FRAMEWORK_SECTION_CHILD_NODE *Child,
IN EFI_SECTION_TYPE SearchType, IN EFI_SECTION_TYPE SearchType,
IN EFI_GUID *SectionDefinitionGuid IN EFI_GUID *SectionDefinitionGuid
) )
{ {
EFI_GUID_DEFINED_SECTION *GuidedSection; EFI_GUID_DEFINED_SECTION *GuidedSection;
@ -458,7 +458,7 @@ ChildIsType (
if (Child->Type != SearchType) { if (Child->Type != SearchType) {
return FALSE; return FALSE;
} }
if (SearchType != EFI_SECTION_GUID_DEFINED) { if ((SearchType != EFI_SECTION_GUID_DEFINED) || (SectionDefinitionGuid == NULL)) {
return TRUE; return TRUE;
} }
GuidedSection = (EFI_GUID_DEFINED_SECTION * )(Stream->StreamBuffer + Child->OffsetInStream); GuidedSection = (EFI_GUID_DEFINED_SECTION * )(Stream->StreamBuffer + Child->OffsetInStream);
@ -1155,11 +1155,11 @@ GetSection (
OUT UINT32 *AuthenticationStatus OUT UINT32 *AuthenticationStatus
) )
{ {
FRAMEWORK_SECTION_STREAM_NODE *StreamNode; FRAMEWORK_SECTION_STREAM_NODE *StreamNode;
EFI_TPL OldTpl; EFI_TPL OldTpl;
EFI_STATUS Status; EFI_STATUS Status;
FRAMEWORK_SECTION_CHILD_NODE *ChildNode; FRAMEWORK_SECTION_CHILD_NODE *ChildNode;
FRAMEWORK_SECTION_STREAM_NODE *ChildStreamNode; FRAMEWORK_SECTION_STREAM_NODE *ChildStreamNode;
UINTN CopySize; UINTN CopySize;
UINT32 ExtractedAuthenticationStatus; UINT32 ExtractedAuthenticationStatus;
UINTN Instance; UINTN Instance;