1) Initialize gBS, gST, gImageHandle in UefiBootServicesTableLib.c to NULL

2) Add DxeCore infix to the module local variable gBS, gST, gRT, gDS in DxeMain.c. This is to solve the name conflict with UefiBootServicesTableLib which is defined in MDE Library Spec. 
3) Add in check for gBS and gST in UefiDebugLibConOut/DebugLib.c and UefiDebugLibStdErr/DebugLib.c and MdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c. If they are not initialized, the API will just return with a error message.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2546 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 4 deletions

diff --git a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
index 0db4707e29..26f62f6c95 100644
--- a/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
+++ b/MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.c
@@ -1,7 +1,7 @@
 /** @file

   UEFI Boot Services Table Library.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2007, Intel Corporation<BR>

   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

@@ -14,9 +14,9 @@
 

 **/

 

-EFI_HANDLE         gImageHandle;

-EFI_SYSTEM_TABLE   *gST;

-EFI_BOOT_SERVICES  *gBS;

+EFI_HANDLE         gImageHandle = NULL;

+EFI_SYSTEM_TABLE   *gST         = NULL;

+EFI_BOOT_SERVICES  *gBS         = NULL;

 

 /**

   The constructor function caches the pointer of Boot Services Table.

@@ -43,6 +43,7 @@ UefiBootServicesTableLibConstructor (
   // Cache the Image Handle

   //

   gImageHandle = ImageHandle;

+  ASSERT (gImageHandle != NULL);

 

   //

   // Cache pointer to the EFI System Table