From 1ace0001356b9798a57a6cb8b87d545f169543fc Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 8 Jan 2010 04:10:38 +0000
Subject: Minor code enhancement.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9692 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c      | 3 ++-
 IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c      | 3 ++-
 .../Universal/SectionExtractionDxe/SectionExtraction.c               | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'IntelFrameworkModulePkg/Universal')

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 72dcb0e15e..ad9eb807de 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -5,7 +5,7 @@
 
   Boot option manipulation
 
-Copyright (c) 2004 - 2009, Intel Corporation. <BR>
+Copyright (c) 2004 - 2010, 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
@@ -1052,6 +1052,7 @@ BOpt_GetBootOptions (
     
     if (HiiString != NULL) {
       NewLoadContext->Description = AllocateZeroPool(StringSize + StrSize(HiiString));
+      ASSERT (NewLoadContext->Description != NULL);
       StrCpy (NewLoadContext->Description, HiiString);
       if (StrnCmp ((UINT16*)LoadOptionPtr, L"0", 1) != 0) {
         StrCat (NewLoadContext->Description, L" ");
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index fdd2befe82..74649f49ce 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -1,7 +1,7 @@
 /** @file
   The platform boot manager reference implementation
 
-Copyright (c) 2004 - 2008, Intel Corporation. <BR>
+Copyright (c) 2004 - 2010, 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
@@ -316,6 +316,7 @@ CallBootManager (
       BufferSize = StrSize(BootStringNumber);
       BufferSize += StrSize(HiiString);
       Option->Description = AllocateZeroPool(BufferSize);
+      ASSERT (Option->Description != NULL);
       StrCpy (Option->Description, HiiString);
       if (StrnCmp (BootStringNumber, L"0", 1) != 0) {
         StrCat (Option->Description, L" ");
diff --git a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
index 10a992a801..6d78a68dd6 100644
--- a/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
+++ b/IntelFrameworkModulePkg/Universal/SectionExtractionDxe/SectionExtraction.c
@@ -27,7 +27,7 @@
   3) A support protocol is not found, and the data is not available to be read
      without it.  This results in EFI_PROTOCOL_ERROR.
 
-Copyright (c) 2006 - 2009, Intel Corporation. <BR>
+Copyright (c) 2006 - 2010, 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
@@ -1054,6 +1054,7 @@ FindChildNode (
         if (EFI_ERROR (Status)) {
           return Status;
         }
+        ASSERT (CurrentChildNode != NULL);
       } else {
         ASSERT (EFI_ERROR (ErrorStatus));
         return ErrorStatus;
@@ -1204,6 +1205,8 @@ GetSection (
     if (EFI_ERROR (Status)) {
       goto GetSection_Done;
     }
+    ASSERT (ChildNode != NULL);
+    ASSERT (ChildStreamNode != NULL);
     CopySize = ChildNode->Size - sizeof (EFI_COMMON_SECTION_HEADER);
     CopyBuffer = ChildStreamNode->StreamBuffer + ChildNode->OffsetInStream + sizeof (EFI_COMMON_SECTION_HEADER);
     *AuthenticationStatus = ExtractedAuthenticationStatus;
-- 
cgit v1.2.3