1. Merger Tracker 8448: PciHostBridgeEnumerator() error checking could lead to memory...

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

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
index 125a4453df4980a6694301cb9cd91b9c1fd31bd7..a55fb432e03d131ea8b2f0f3a453e1386684e261 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/Capsule.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 Module Name:\r
 \r
@@ -33,7 +33,7 @@ CapsuleServiceInitialize (
 Routine Description:\r
 \r
   This code is capsule runtime service initialization.\r
-  \r
+\r
 Arguments:\r
 \r
   ImageHandle          The image handle\r
@@ -48,6 +48,7 @@ Returns:
   EFI_STATUS  Status;\r
   EFI_HANDLE  NewHandle;\r
 \r
+  EFI_DEADLOOP ();\r
   SystemTable->RuntimeServices->UpdateCapsule                    = UpdateCapsule;\r
   SystemTable->RuntimeServices->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;\r
 \r

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index b7b946e1fa87f6c4f6875c6a43a5b3a9a442a2cb..b80b8f7a245cef0d434e3800c39bc4e6354eeacb 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -22,6 +22,10 @@
     <OutputFileBasename>CapsuleRuntime</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
+    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+      <Keyword>BaseLib</Keyword>\r
+    </LibraryClass>\r
+\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
index a7cb5f68c9e6589cd3a0ff9b503be04932cf1514..202d6a3586a8bae422b55f34714ee01a87d73162 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c
@@ -156,6 +156,7 @@ Returns:
 {\r
   EFI_STATUS  Status;\r
 \r
+  EFI_DEADLOOP ();\r
   Status = VariableCommonInitialize (ImageHandle, SystemTable);\r
   ASSERT_EFI_ERROR (Status);\r
 \r