summaryrefslogtreecommitdiffstats
path: root/EdkModulePkg/Universal
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2007-06-05 05:13:27 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2007-06-05 05:13:27 +0000
commit07a171a42a119e8f001e26f95e524e44d4c3f741 (patch)
tree1a9d110b11a207f586c4e568ded5d8c1a38deb10 /EdkModulePkg/Universal
parent25df080117785575e7d761c9b8c8cccfc066e85d (diff)
downloadedk2-07a171a42a119e8f001e26f95e524e44d4c3f741.tar.gz
edk2-07a171a42a119e8f001e26f95e524e44d4c3f741.tar.bz2
edk2-07a171a42a119e8f001e26f95e524e44d4c3f741.zip
1. Merger Tracker 8448: PciHostBridgeEnumerator() error checking could lead to memory leak
2. Merger Tracker 8450: AllRootHPCInitialized() passed in timeout value incorrect git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2627 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg/Universal')
-rw-r--r--EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c19
-rw-r--r--EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa4
-rw-r--r--EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c1
3 files changed, 15 insertions, 9 deletions
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
index 125a4453df..a55fb432e0 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
@@ -1,13 +1,13 @@
/*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-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
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+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
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -33,7 +33,7 @@ CapsuleServiceInitialize (
Routine Description:
This code is capsule runtime service initialization.
-
+
Arguments:
ImageHandle The image handle
@@ -48,6 +48,7 @@ Returns:
EFI_STATUS Status;
EFI_HANDLE NewHandle;
+ EFI_DEADLOOP ();
SystemTable->RuntimeServices->UpdateCapsule = UpdateCapsule;
SystemTable->RuntimeServices->QueryCapsuleCapabilities = QueryCapsuleCapabilities;
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index b7b946e1fa..b80b8f7a24 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -23,6 +23,10 @@
</ModuleDefinitions>
<LibraryClassDefinitions>
<LibraryClass Usage="ALWAYS_CONSUMED">
+ <Keyword>BaseLib</Keyword>
+ </LibraryClass>
+
+ <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>UefiDriverEntryPoint</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index a7cb5f68c9..202d6a3586 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -156,6 +156,7 @@ Returns:
{
EFI_STATUS Status;
+ EFI_DEADLOOP ();
Status = VariableCommonInitialize (ImageHandle, SystemTable);
ASSERT_EFI_ERROR (Status);