Minor bug fix and robustness check improvement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10168 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
rsun3
2010-03-03 09:40:16 +00:00
parent 9dbad162da
commit 60cf9cfc14
3 changed files with 10 additions and 6 deletions

View File

@@ -807,6 +807,7 @@ FindChildNode (
CurrentChildNode = CHILD_SECTION_NODE_FROM_LINK (GetFirstNode(&SourceStream->Children));
for (;;) {
ASSERT (CurrentChildNode != NULL);
if (ChildIsType (SourceStream, CurrentChildNode, SearchType, SectionDefinitionGuid)) {
//
// The type matches, so check the instance count to see if it's the one we want
@@ -877,7 +878,6 @@ FindChildNode (
if (EFI_ERROR (Status)) {
return Status;
}
ASSERT (CurrentChildNode != NULL);
} else {
ASSERT (EFI_ERROR (ErrorStatus));
return ErrorStatus;

View File

@@ -1391,6 +1391,7 @@ FindNextCoreFvHandle (
}
}
ASSERT (Private->FvCount <= FixedPcdGet32 (PcdPeiCoreMaxFvSupported));
if (Instance >= Private->FvCount) {
return NULL;
}
@@ -1473,7 +1474,7 @@ AddUnknownFormatFvInfo (
{
PEI_CORE_UNKNOW_FORMAT_FV_INFO *NewUnknownFv;
if (PrivateData->UnknownFvInfoCount + 1 >= FixedPcdGet32 (PcdPeiCoreMaxPeimPerFv)) {
if (PrivateData->UnknownFvInfoCount + 1 >= FixedPcdGet32 (PcdPeiCoreMaxFvSupported)) {
return EFI_OUT_OF_RESOURCES;
}